@dative-gpi/foundation-core-domain 0.0.201 → 0.0.203

package/models/chartOrganisationTypes/chartOrganisationTypeDetails.ts

@@ -12,6 +12,14 @@ import type { ChartAxisDTO, CreateChartAxisDTO } from "../charts/chartAxis";
 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 { ChartModifier } from "../charts/chartModifier";
+import type { ChartModifierDTO,CreateChartModifierDTO } from "../charts/chartModifier";
+import { ChartOperand } from "../charts/chartOperand";
+import type { ChartOperandDTO,CreateChartOperandDTO } from "../charts/chartOperand";
+import { ChartSerie } from "../charts/chartSerie";
+import type { ChartSerieDTO,CreateChartSerieDTO } from "../charts/chartSerie";
 import type { ColorSets } from "../enums/chartEnums";
 
 export class ChartOrganisationTypeDetails extends ChartOrganisationTypeInfos {
@@ -26,6 +34,11 @@ export class ChartOrganisationTypeDetails extends ChartOrganisationTypeInfos {
   chartPresets: ChartPreset[];
   chartPresetFilters: ChartPresetFilter[];
   chartPlots: ChartPlot[];
+  chartSeries: ChartSerie[];
+  chartOperands: ChartOperand[];
+  chartFilters: ChartFilter[];
+  chartModifiers: ChartModifier[];
+  yAxis: ChartAxis[];
   translations: ChartTranslation[];
 
   constructor(params: ChartOrganisationTypeDetailsDTO) {
@@ -43,6 +56,11 @@ export class ChartOrganisationTypeDetails extends ChartOrganisationTypeInfos {
     this.chartPresets = params.chartPresets.map(cp => new ChartPreset(cp));
     this.chartPresetFilters = params.chartPresetFilters.map(cpf => new ChartPresetFilter(cpf));
     this.chartPlots = params.chartPlots.map(cp => new ChartPlot(cp));
+    this.chartSeries = params.chartSeries.map(cs => new ChartSerie(cs));
+    this.chartOperands = params.chartOperands.map(co => new ChartOperand(co));
+    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.translations = params.translations.map((translation) => new ChartTranslation(translation));
   }
 }
@@ -59,6 +77,11 @@ export interface ChartOrganisationTypeDetailsDTO extends ChartOrganisationTypeIn
   chartPresets: ChartPresetDTO[];
   chartPresetFilters: ChartPresetFilterDTO[];
   chartPlots: ChartPlotDTO[];
+  chartSeries: ChartSerieDTO[];
+  chartOperands: ChartOperandDTO[];
+  chartFilters: ChartFilterDTO[];
+  chartModifiers: ChartModifierDTO[];
+  yAxis: ChartAxisDTO[];
   translations: ChartTranslationDTO[];
 }
 
@@ -87,5 +110,10 @@ export interface UpdateChartOrganisationTypeDTO {
   chartPresets: CreateChartPresetDTO[];
   chartPresetFilters: CreateChartPresetFilterDTO[];
   chartPlots: CreateChartPlotDTO[];
+  chartSeries: CreateChartSerieDTO[];
+  chartOperands: CreateChartOperandDTO[];
+  chartFilters: CreateChartFilterDTO[];
+  chartModifiers: CreateChartModifierDTO[];
+  yAxis: CreateChartAxisDTO[];
   translations: ChartTranslationDTO[];
 }

package/models/chartOrganisations/chartOrganisationDetails.ts

@@ -12,6 +12,14 @@ import type { ChartAxisDTO, CreateChartAxisDTO } from "../charts/chartAxis";
 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 { ChartModifier } from "../charts/chartModifier";
+import type { ChartModifierDTO,CreateChartModifierDTO } from "../charts/chartModifier";
+import { ChartOperand } from "../charts/chartOperand";
+import type { ChartOperandDTO,CreateChartOperandDTO } from "../charts/chartOperand";
+import { ChartSerie } from "../charts/chartSerie";
+import type { ChartSerieDTO,CreateChartSerieDTO } from "../charts/chartSerie";
 import type { ColorSets } from "../enums/chartEnums";
 
 export class ChartOrganisationDetails extends ChartOrganisationInfos {
@@ -26,6 +34,11 @@ export class ChartOrganisationDetails extends ChartOrganisationInfos {
   chartPresets: ChartPreset[];
   chartPresetFilters: ChartPresetFilter[];
   chartPlots: ChartPlot[];
+  chartseries: ChartSerie[];
+  chartOperands: ChartOperand[];
+  chartModifiers: ChartModifier[];
+  chartFilters: ChartFilter[];
+  yAxis: ChartAxis[];
   translations: ChartTranslation[];
 
   constructor(params: ChartOrganisationDetailsDTO) {
@@ -43,6 +56,11 @@ export class ChartOrganisationDetails extends ChartOrganisationInfos {
     this.chartPresets = params.chartPresets.map(cp => new ChartPreset(cp));
     this.chartPresetFilters = params.chartPresetFilters.map(cpf => new ChartPresetFilter(cpf));
     this.chartPlots = params.chartPlots.map(cp => new ChartPlot(cp));
+    this.chartseries = params.chartSeries.map(cs => new ChartSerie(cs));
+    this.chartOperands = params.chartOperands.map(co => new ChartOperand(co));
+    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.translations = params.translations.map(t => new ChartTranslation(t));
   }
 }
@@ -59,6 +77,11 @@ export interface ChartOrganisationDetailsDTO extends ChartOrganisationInfosDTO {
   chartPresets: ChartPresetDTO[];
   chartPresetFilters: ChartPresetFilterDTO[];
   chartPlots: ChartPlotDTO[];
+  chartSeries: ChartSerieDTO[];
+  chartOperands: ChartOperandDTO[];
+  chartModifiers: ChartModifierDTO[];
+  chartFilters: ChartFilterDTO[];
+  yAxis: ChartAxisDTO[]
   translations: ChartTranslationDTO[];
 }
 
@@ -94,5 +117,10 @@ export interface UpdateChartOrganisationDTO {
   chartPresets: CreateChartPresetDTO[];
   chartPresetFilters: CreateChartPresetFilterDTO[];
   chartPlots: CreateChartPlotDTO[];
+  chartSeries: CreateChartSerieDTO[];
+  chartOperands: CreateChartOperandDTO[];
+  chartModifiers: CreateChartModifierDTO[];
+  chartFilters: CreateChartFilterDTO[];
+  yAxis: ChartAxisDTO[];
   translations: ChartTranslationDTO[];
 }

package/models/charts/chartAxis.ts

@@ -2,9 +2,12 @@ import type { ChartValueRangeDTO, CreateChartValueRangeDTO } from "./chartValueR
 import { ChartValueRange } from "./chartValueRange";
 import type { CreateChartTimeRangeDTO, ChartTimeRangeDTO } from "./chartTimeRange";
 import { ChartTimeRange } from "./chartTimeRange";
-import { AxisType } from "../enums/chartEnums";
+import type { AxisType } from "../enums/chartEnums";
 
 export class ChartAxis {
+  id : string;
+  chartId : string;
+  hiddenCode : string;
   type: AxisType;
   logarithmic: boolean;
   boundaries: boolean;
@@ -14,29 +17,26 @@ export class ChartAxis {
   valueRanges: ChartValueRange[];
   timeRanges: ChartTimeRange[];
 
-  constructor(params?: ChartAxisDTO) {
-    if (params == null) {
-      this.type = AxisType.None;
-      this.logarithmic = false;
-      this.boundaries = false;
-      this.unit = "";
-      this.valueRanges = [];
-      this.timeRanges = [];
-    }
-    else {
-      this.type = params.type as AxisType;
-      this.logarithmic = params.logarithmic;
-      this.boundaries = params.boundaries;
-      this.min = params.min;
-      this.max = params.max;
-      this.unit = params.unit;
-      this.valueRanges = params.valueRanges.map(vr => new ChartValueRange(vr));
-      this.timeRanges = params.timeRanges.map(tr => new ChartTimeRange(tr));
-    }
+  constructor(params: ChartAxisDTO) {
+    this.id = params.id;
+    this.chartId = params.chartId;
+    this.hiddenCode = params.hiddenCode;
+    this.type = params.type as AxisType;
+    this.logarithmic = params.logarithmic;
+    this.boundaries = params.boundaries;
+    this.min = params.min;
+    this.max = params.max;
+    this.unit = params.unit;
+    this.valueRanges = params.valueRanges.map(vr => new ChartValueRange(vr));
+    this.timeRanges = params.timeRanges.map(tr => new ChartTimeRange(tr));
+    
   }
 }
 
 export interface ChartAxisDTO {
+  id : string;
+  chartId : string;
+  hiddenCode : string;
   type: AxisType;
   logarithmic: boolean;
   boundaries: boolean;
@@ -48,6 +48,7 @@ export interface ChartAxisDTO {
 }
 
 export interface CreateChartAxisDTO {
+  hiddenCode : string;
   type: AxisType;
   logarithmic: boolean;
   boundaries: boolean;

package/models/charts/chartDetails.ts

@@ -10,6 +10,15 @@ import type { ChartAxisDTO } from "./chartAxis";
 import { ChartAxis } from "./chartAxis";
 import type { ChartPlotDTO } from "./chartPlot";
 import { ChartPlot } from "./chartPlot";
+import { ChartSerie } from "./chartSerie";
+import type { ChartSerieDTO } from "./chartSerie";
+import { ChartOperand } from "./chartOperand";
+import type { ChartOperandDTO } from "./chartOperand";
+import { ChartModifier } from "./chartModifier";
+import type { ChartModifierDTO } from "./chartModifier";
+import { ChartFilter} from "./chartFilter";
+import type { ChartFilterDTO } from "./chartFilter";
+
 import type { ColorSets } from "../enums/chartEnums";
 
 export class ChartDetails extends ChartInfos {
@@ -19,6 +28,11 @@ export class ChartDetails extends ChartInfos {
   aggregates: boolean | null;
   dynamicVariables: boolean | null;
   chartVariables: ChartVariable[];
+  chartSeries: ChartSerie[];
+  chartOperands: ChartOperand[];
+  chartModifiers: ChartModifier[];
+  chartFilters: ChartFilter[];
+  yAxis: ChartAxis[];
   chartPresets: ChartPreset[];
   chartPresetFilters: ChartPresetFilter[];
   chartPlots: ChartPlot[];
@@ -36,6 +50,11 @@ export class ChartDetails extends ChartInfos {
     this.chartPresets = params.chartPresets.map(cp => new ChartPreset(cp));
     this.chartPresetFilters = params.chartPresetFilters.map(cpf => new ChartPresetFilter(cpf));
     this.chartPlots = params.chartPlots.map(cp => new ChartPlot(cp));
+    this.chartSeries = params.chartSeries.map(cs => new ChartSerie(cs));
+    this.chartOperands = params.chartOperands.map(co => new ChartOperand(co));
+    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));
   }
 }
 
@@ -47,6 +66,11 @@ export interface ChartDetailsDTO extends ChartInfosDTO {
   dynamicVariables: boolean | null;
   chartVariables: ChartVariableDTO[];
   chartPresets: ChartPresetDTO[];
+  chartSeries: ChartSerieDTO[];
+  chartOperands: ChartOperandDTO[];
+  chartModifiers: ChartModifierDTO[];
+  chartFilters: ChartFilterDTO[];
+  yAxis: ChartAxisDTO[];
   chartPresetFilters: ChartPresetFilterDTO[];
   chartPlots: ChartPlotDTO[];
 }

package/models/charts/chartFilter.ts

@@ -2,48 +2,54 @@ import type { ChartFilterValueDTO, CreateChartFilterValueDTO } from "./chartFilt
 import { ChartFilterValue } from "./chartFilterValue";
 import type { ChartFilterTranslationDTO } from "./chartFilterTranslation";
 import { ChartFilterTranslation } from "./chartFilterTranslation";
-import type { ChartPresetFilterDTO } from "./chartPresetFilter";
-import { ChartPresetFilter } from "./chartPresetFilter";
 import type { FilterType } from "../enums/sharedEnums";
 
 export class ChartFilter {
   id: string;
+  chartId : string;
+  hiddenCode: string;
+  chartOperandHiddenCode : string;
   dataDefinitionId: string;
   label: string;
   labelDefault: string;
   filterType: FilterType;
   filterValues: ChartFilterValue[];
   filterDynamic: boolean;
-  chartPresets: ChartPresetFilter[];
   translations: ChartFilterTranslation[];
 
   constructor(params: ChartFilterDTO) {
     this.id = params.id;
+    this.chartId = params.chartId;
+    this.hiddenCode = params.hiddenCode;
+    this.chartOperandHiddenCode = params.chartOperandHiddenCode
     this.dataDefinitionId = params.dataDefinitionId;
     this.label = params.label;
     this.labelDefault = params.labelDefault;
     this.filterType = params.filterType as FilterType;
     this.filterValues = params.filterValues.map(fv => new ChartFilterValue(fv));
     this.filterDynamic = params.filterDynamic;
-    this.chartPresets = params.chartPresets.map(cp => new ChartPresetFilter(cp));
     this.translations = params.translations.map(t => new ChartFilterTranslation(t));
   }
 }
 
 export interface ChartFilterDTO {
   id: string;
+  chartId : string;
+  hiddenCode: string;
+  chartOperandHiddenCode : string;
   dataDefinitionId: string;
   label: string;
   labelDefault: string;
   filterType: number;
   filterValues: ChartFilterValueDTO[];
   filterDynamic: boolean;
-  chartPresets: ChartPresetFilterDTO[];
   translations: ChartFilterTranslationDTO[];
 }
 
 export interface CreateChartFilterDTO {
   id: string;
+  hiddenCode: string;
+  chartOperandHiddenCode : string;
   dataDefinitionId: string;
   labelDefault: string;
   filterType: FilterType;

package/models/charts/chartModifier.ts

@@ -1,4 +1,6 @@
 export class ChartModifier {
+  chartId : string;
+  hiddenCode: string;
   dataDefinitionId: string;
   hideLabel: boolean;
   
@@ -9,11 +11,13 @@ export class ChartModifier {
 }
   
 export interface ChartModifierDTO {
+  hiddenCode: string;
   dataDefinitionId: string;
   hideLabel: boolean;
 }
 
 export interface CreateChartModifierDTO {
+  hiddenCode: string;
   dataDefinitionId: string;
   hideLabel: boolean;
 }

package/models/charts/chartOperand.ts

@@ -1,63 +1,69 @@
-import type { ChartModifierDTO, CreateChartModifierDTO } from "./chartModifier";
-import { ChartModifier } from "./chartModifier";
-import type { ChartFilterDTO, CreateChartFilterDTO } from "./chartFilter";
-import { ChartFilter } from "./chartFilter";
 import type { AggregationType } from "../enums/chartEnums";
 
 export class ChartOperand {
   id: string;
+  chartId : string;
+  hiddenCode: string;
+  chartSerieHiddenCode: string;
   name: string;
   aggregation?: AggregationType;
   modelId: string;
   modelLabel: string;
   dataCategoryId: string;
   dataDefinitionId?: string;
-  xAxis?: ChartModifier;
-  yAxis?: ChartModifier;
-  firstModifier?: ChartModifier;
-  secondModifier?: ChartModifier;
-  filters: ChartFilter[];
+  xAxisModifierHiddenCode?: string;
+  yAxisModifierHiddenCode?: string;
+  firstModifierHiddenCode?: string;
+  secondModifierHiddenCode?: string;
+  index : number;
 
   constructor(params: ChartOperandDTO) {
     this.id = params.id;
+    this.chartId = params.chartId;
+    this.hiddenCode = params.hiddenCode;
+    this.chartSerieHiddenCode = params.chartSerieHiddenCode;
     this.name = params.name
     this.aggregation = (params.aggregation as AggregationType) ?? undefined;
     this.modelId = params.modelId;
     this.modelLabel = params.modelLabel;
     this.dataCategoryId = params.dataCategoryId;
     this.dataDefinitionId = params.dataDefinitionId;
-    this.xAxis = params.xAxis ? new ChartModifier(params.xAxis) : undefined;
-    this.yAxis = params.yAxis ? new ChartModifier(params.yAxis) : undefined;
-    this.firstModifier = params.firstModifier ? new ChartModifier(params.firstModifier) : undefined;
-    this.secondModifier = params.secondModifier ? new ChartModifier(params.secondModifier) : undefined;
-    this.filters = params.filters.map(f => new ChartFilter(f));
+    this.xAxisModifierHiddenCode = params.xAxisModifierHiddenCode;
+    this.yAxisModifierHiddenCode = params.yAxisModifierHiddenCode;
+    this.firstModifierHiddenCode = params.firstModifierHiddenCode;
+    this.secondModifierHiddenCode = params.secondModifierHiddenCode;
+    this.index = params.index;
   }
 }
 
 export interface ChartOperandDTO {
   id: string;
+  chartId : string;
+  hiddenCode: string;
+  chartSerieHiddenCode: string;
   name: string;
   aggregation?: number;
   modelId: string;
   modelLabel: string;
   dataCategoryId: string;
   dataDefinitionId?: string;
-  xAxis?: ChartModifierDTO;
-  yAxis?: ChartModifierDTO;
-  firstModifier?: ChartModifierDTO;
-  secondModifier?: ChartModifierDTO;
-  filters: ChartFilterDTO[];
+  xAxisModifierHiddenCode?: string;
+  yAxisModifierHiddenCode?: string;
+  firstModifierHiddenCode?: string;
+  secondModifierHiddenCode?: string;
+  index : number;
 }
 
 export interface CreateChartOperandDTO {
+  hiddenCode: string;
+  chartSerieHiddenCode: string;
   name: string;
   aggregation?: number;
   modelId: string;
   dataCategoryId: string;
   dataDefinitionId?: string;
-  xAxis?: CreateChartModifierDTO;
-  yAxis?: CreateChartModifierDTO;
-  firstModifier?: CreateChartModifierDTO;
-  secondModifier?: CreateChartModifierDTO;
-  filters: CreateChartFilterDTO[];
+  xAxisModifierHiddenCode?: string;
+  yAxisModifierHiddenCode?: string;
+  firstModifierHiddenCode?: string;
+  secondModifierHiddenCode?: string;
 }

package/models/charts/chartPlot.ts

@@ -1,30 +1,29 @@
-import type { ChartSerieDTO, CreateChartSerieDTO } from "./chartSerie";
-import { ChartSerie } from "./chartSerie";
-import type { ChartAxisDTO, CreateChartAxisDTO } from "./chartAxis";
-import { ChartAxis } from "./chartAxis";
 
 export class ChartPlot {
   id: string;
   chartId: string;
-  yAxis?: ChartAxis;
-  chartSeries: ChartSerie[];
+  hiddenCode: string;
+  yAxisHiddenCode?: string;
+  index : number;
 
   constructor(params: ChartPlotDTO) {
     this.id = params.id;
     this.chartId = params.chartId;
-    this.yAxis = params.yAxis ? new ChartAxis(params.yAxis) : undefined;
-    this.chartSeries = params.chartSeries.map(cts => new ChartSerie(cts));
+    this.hiddenCode = params.hiddenCode;
+    this.yAxisHiddenCode = params.yAxisHiddenCode;
+    this.index = params.index;
   }
 }
 
 export interface ChartPlotDTO {
   id: string;
   chartId: string;
-  yAxis?: ChartAxisDTO;
-  chartSeries: ChartSerieDTO[];
+  hiddenCode: string;
+  yAxisHiddenCode?: string;
+  index : number;
 }
 
 export interface CreateChartPlotDTO {
-  yAxis?: CreateChartAxisDTO;
-  chartSeries: CreateChartSerieDTO[];
+  hiddenCode: string;
+  yAxisHiddenCode?: string;
 }

package/models/charts/chartPreset.ts

@@ -1,24 +1,22 @@
 import type { ChartPresetTranslationDTO } from "./chartPresetTranslation";
 import { ChartPresetTranslation } from "./chartPresetTranslation";
-import type { ChartPresetFilterDTO } from "./chartPresetFilter";
-import { ChartPresetFilter } from "./chartPresetFilter";
 
 export class ChartPreset {
   id: string;
   chartId: string;
+  hiddenCode: string;
   label: string;
   labelDefault: string;
   icon: string;
-  chartFilters: ChartPresetFilter[];
   translations: ChartPresetTranslation[];
 
   constructor(params: ChartPresetDTO) {
     this.id = params.id;
     this.chartId = params.chartId;
+    this.hiddenCode = params.hiddenCode;
     this.label = params.label;
     this.labelDefault = params.labelDefault;
     this.icon = params.icon;
-    this.chartFilters = params.chartFilters.map(cf => new ChartPresetFilter(cf));
     this.translations = params.translations.map(t => new ChartPresetTranslation(t));
   }
 }
@@ -26,16 +24,16 @@ export class ChartPreset {
 export interface ChartPresetDTO {
   id: string;
   chartId: string;
+  hiddenCode: string;
   label: string;
   labelDefault: string;
   icon: string;
-  chartFilters: ChartPresetFilterDTO[];
   translations: ChartPresetTranslationDTO[];
 }
 
 export interface CreateChartPresetDTO {
   id: string;
-  chartId: string;
+  hiddenCode: string;
   labelDefault: string;
   icon: string;
   translations: ChartPresetTranslationDTO[];

package/models/charts/chartPresetFilter.ts

@@ -1,29 +1,32 @@
 export class ChartPresetFilter {
   id: string;
-  chartPresetId: string;
-  chartPresetLabel: string;
-  chartFilterId: string;
+  chartId : string;
+  chartPresetHiddenCode: string;
+  chartFilterHiddenCode: string;
   chartFilterLabel: string;
+  chartPresetLabel: string;
 
 
   constructor(params: ChartPresetFilterDTO) {
     this.id = params.id;
-    this.chartPresetId = params.chartPresetId;
-    this.chartPresetLabel = params.chartPresetLabel;
-    this.chartFilterId = params.chartFilterId;
+    this.chartId = params.chartId;
+    this.chartPresetHiddenCode = params.chartPresetHiddenCode;
+    this.chartFilterHiddenCode = params.chartFilterHiddenCode;
     this.chartFilterLabel = params.chartFilterLabel;
+    this.chartPresetLabel = params.chartPresetLabel;
   }
 }
 
 export interface ChartPresetFilterDTO {
   id: string;
-  chartPresetId: string;
-  chartPresetLabel: string;
-  chartFilterId: string;
+  chartId : string;
+  chartPresetHiddenCode: string;
+  chartFilterHiddenCode: string;
   chartFilterLabel: string;
+  chartPresetLabel: string;
 }
 
 export interface CreateChartPresetFilterDTO {
-  chartPresetId: string;
-  chartFilterId: string;
+  chartPresetHiddenCode: string;
+  chartFilterHiddenCode: string;
 }

package/models/charts/chartSerie.ts

@@ -4,12 +4,12 @@ import type { ChartValueRangeDTO, CreateChartValueRangeDTO } from "./chartValueR
 import { ChartValueRange } from "./chartValueRange";
 import type { ChartTimeStepDTO, CreateChartTimeStepDTO } from "./chartTimeStep";
 import { ChartTimeStep } from "./chartTimeStep";
-import type { ChartOperandDTO, CreateChartOperandDTO } from "./chartOperand";
-import { ChartOperand } from "./chartOperand";
 
 export class ChartSerie {
   id: string;
-  chartPlotId: string;
+  chartId: string;
+  hiddenCode: string;
+  chartPlotHiddenCode: string;
   serieType: number;
   plotPer?: number;
   shift?: ChartTimeStep;
@@ -39,7 +39,6 @@ export class ChartSerie {
   useOther?: boolean;
   otherThreshold?: number;
   baseBreakdown?: number;
-  chartOperands: ChartOperand[];
   label?: string;
   xAxisLabel?: string;
   yAxisLabel?: string;
@@ -50,7 +49,9 @@ export class ChartSerie {
 
   constructor(params: ChartSerieDTO) {
     this.id = params.id;
-    this.chartPlotId = params.chartPlotId;
+    this.chartId = params.chartId;
+    this.hiddenCode = params.hiddenCode;
+    this.chartPlotHiddenCode = params.chartPlotHiddenCode;
     this.serieType = params.serieType;
     this.plotPer = params.plotPer;
     this.shift = params.shift ? new ChartTimeStep(params.shift) : undefined;
@@ -80,7 +81,6 @@ export class ChartSerie {
     this.useOther = params.useOther;
     this.otherThreshold = params.otherThreshold;
     this.baseBreakdown = params.baseBreakdown;
-    this.chartOperands = params.chartOperands.map(o => new ChartOperand(o));
     this.label = params.label;
     this.xAxisLabel = params.xAxisLabel;
     this.yAxisLabel = params.yAxisLabel;
@@ -93,7 +93,9 @@ export class ChartSerie {
 
 export interface ChartSerieDTO {
   id: string;
-  chartPlotId: string;
+  chartId: string;
+  hiddenCode: string;
+  chartPlotHiddenCode: string;
   serieType: number;
   plotPer?: number;
   shift?: ChartTimeStepDTO;
@@ -123,7 +125,6 @@ export interface ChartSerieDTO {
   useOther?: boolean;
   otherThreshold?: number;
   baseBreakdown?: number;
-  chartOperands: ChartOperandDTO[];
   label?: string;
   xAxisLabel?: string;
   yAxisLabel?: string;
@@ -134,6 +135,8 @@ export interface ChartSerieDTO {
 }
 
 export interface CreateChartSerieDTO {
+  hiddenCode: string;
+  chartPlotHiddenCode: string;
   serieType: number;
   plotPer?: number;
   shift?: CreateChartTimeStepDTO;
@@ -158,7 +161,6 @@ export interface CreateChartSerieDTO {
   displayAs?: number;
   useOther?: boolean;
   otherThreshold?: number;
-  chartOperands: CreateChartOperandDTO[];
   labelDefault?: string;
   xAxisLabelDefault?: string;
   yAxisLabelDefault?: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-domain",
   "sideEffects": false,
-  "version": "0.0.201",
+  "version": "0.0.203",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -9,5 +9,5 @@
   "main": "index.ts",
   "author": "",
   "license": "ISC",
-  "gitHead": "36570e97911fc649951dc1c63ea0fd37c6e09385"
+  "gitHead": "c458860cdad7dff7f9512dddaffe26e60418f880"
 }