@dative-gpi/foundation-core-domain 0.0.141 → 0.0.142

package/models/chartOrganisationTypes/chartOrganisationTypeDetails.ts

@@ -1,10 +1,10 @@
+import { ChartPresetFilter, ChartPresetFilterDTO, CreateChartPresetFilterDTO } from "../charts/chartPresetFilter";
 import { ChartOrganisationTypeInfos, ChartOrganisationTypeInfosDTO } from "./chartOrganisationTypeInfos";
 import { ChartVariable, ChartVariableDTO, CreateChartVariableDTO } from "../charts/chartVariable";
 import { ChartPreset, ChartPresetDTO, CreateChartPresetDTO } from "../charts/chartPreset";
 import { ChartTranslation, ChartTranslationDTO } from "../charts/chartTranslation";
 import { ChartAxis, ChartAxisDTO, CreateChartAxisDTO } from "../charts/chartAxis";
 import { ChartPlot, ChartPlotDTO, CreateChartPlotDTO } from "../charts/chartPlot";
-import { CreateChartPresetFilterDTO } from "../charts/chartPresetFilter";
 import { ColorSets } from "../enums/chartEnums";
 
 export class ChartOrganisationTypeDetails extends ChartOrganisationTypeInfos {
@@ -17,6 +17,7 @@ export class ChartOrganisationTypeDetails extends ChartOrganisationTypeInfos {
   dynamicVariables: boolean | null;
   chartVariables: ChartVariable[];
   chartPresets: ChartPreset[];
+  chartPresetFilters: ChartPresetFilter[];
   chartPlots: ChartPlot[];
   translations: ChartTranslation[];
 
@@ -33,6 +34,7 @@ export class ChartOrganisationTypeDetails extends ChartOrganisationTypeInfos {
     this.dynamicVariables = params.dynamicVariables;
     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));
     this.chartPlots = params.chartPlots.map(cp => new ChartPlot(cp));
     this.translations = params.translations.map((translation) => new ChartTranslation(translation));
   }
@@ -48,6 +50,7 @@ export interface ChartOrganisationTypeDetailsDTO extends ChartOrganisationTypeIn
   dynamicVariables: boolean | null;
   chartVariables: ChartVariableDTO[];
   chartPresets: ChartPresetDTO[];
+  chartPresetFilters: ChartPresetFilterDTO[];
   chartPlots: ChartPlotDTO[];
   translations: ChartTranslationDTO[];
 }

package/models/chartOrganisations/chartOrganisationDetails.ts

@@ -1,11 +1,11 @@
+import { ChartPresetFilter, ChartPresetFilterDTO, CreateChartPresetFilterDTO } from "../charts/chartPresetFilter";
 import { ChartVariable, ChartVariableDTO, CreateChartVariableDTO } from "../charts/chartVariable";
 import { ChartOrganisationInfos, ChartOrganisationInfosDTO } from "./chartOrganisationInfos";
 import { ChartPreset, ChartPresetDTO, CreateChartPresetDTO } from "../charts/chartPreset";
+import { ChartTranslation, ChartTranslationDTO } from "../charts/chartTranslation";
 import { ChartAxis, ChartAxisDTO, CreateChartAxisDTO } from "../charts/chartAxis";
 import { ChartPlot, ChartPlotDTO, CreateChartPlotDTO } from "../charts/chartPlot";
-import { CreateChartPresetFilterDTO } from "../charts/chartPresetFilter";
 import { ColorSets } from "../enums/chartEnums";
-import { ChartTranslation, ChartTranslationDTO } from "../charts/chartTranslation";
 
 export class ChartOrganisationDetails extends ChartOrganisationInfos {
   labelDefault: string;
@@ -17,6 +17,7 @@ export class ChartOrganisationDetails extends ChartOrganisationInfos {
   dynamicVariables: boolean | null;
   chartVariables: ChartVariable[];
   chartPresets: ChartPreset[];
+  chartPresetFilters: ChartPresetFilter[];
   chartPlots: ChartPlot[];
   translations: ChartTranslation[];
 
@@ -33,6 +34,7 @@ export class ChartOrganisationDetails extends ChartOrganisationInfos {
     this.dynamicVariables = params.dynamicVariables;
     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));
     this.chartPlots = params.chartPlots.map(cp => new ChartPlot(cp));
     this.translations = params.translations.map(t => new ChartTranslation(t));
   }
@@ -48,6 +50,7 @@ export interface ChartOrganisationDetailsDTO extends ChartOrganisationInfosDTO {
   dynamicVariables: boolean | null;
   chartVariables: ChartVariableDTO[];
   chartPresets: ChartPresetDTO[];
+  chartPresetFilters: ChartPresetFilterDTO[];
   chartPlots: ChartPlotDTO[];
   translations: ChartTranslationDTO[];
 }

package/models/charts/chartDetails.ts

@@ -1,4 +1,6 @@
+import { ChartPresetFilter, ChartPresetFilterDTO } from "./chartPresetFilter";
 import { ChartVariable, ChartVariableDTO } from "./chartVariable";
+import { ChartPreset, ChartPresetDTO } from "./chartPreset";
 import { ChartInfos, ChartInfosDTO } from "./chartInfos";
 import { ChartAxis, ChartAxisDTO } from "./chartAxis";
 import { ChartPlot, ChartPlotDTO } from "./chartPlot";
@@ -11,6 +13,8 @@ export class ChartDetails extends ChartInfos {
   aggregates: boolean | null;
   dynamicVariables: boolean | null;
   chartVariables: ChartVariable[];
+  chartPresets: ChartPreset[];
+  chartPresetFilters: ChartPresetFilter[];
   chartPlots: ChartPlot[];
 
   constructor(params: ChartDetailsDTO) {
@@ -23,6 +27,8 @@ export class ChartDetails extends ChartInfos {
     this.aggregates = params.aggregates;
     this.dynamicVariables = params.dynamicVariables;
     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));
     this.chartPlots = params.chartPlots.map(cp => new ChartPlot(cp));
   }
 }
@@ -34,5 +40,7 @@ export interface ChartDetailsDTO extends ChartInfosDTO {
   aggregates: boolean | null;
   dynamicVariables: boolean | null;
   chartVariables: ChartVariableDTO[];
+  chartPresets: ChartPresetDTO[];
+  chartPresetFilters: ChartPresetFilterDTO[];
   chartPlots: ChartPlotDTO[];
 }

package/models/charts/chartFilter.ts

@@ -1,38 +1,51 @@
 import { ChartFilterValue, ChartFilterValueDTO, CreateChartFilterValueDTO } from "./chartFilterValue";
-import { FilterType } from "../enums/sharedEnums";
+import { ChartFilterTranslation, ChartFilterTranslationDTO } from "./chartFilterTranslation";
 import { ChartPresetFilter, ChartPresetFilterDTO } from "./chartPresetFilter";
+import { FilterType } from "../enums/sharedEnums";
 
 export class ChartFilter {
   id: 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.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;
   dataDefinitionId: string;
+  label: string;
+  labelDefault: string;
   filterType: number;
   filterValues: ChartFilterValueDTO[];
   filterDynamic: boolean;
   chartPresets: ChartPresetFilterDTO[];
+  translations: ChartFilterTranslationDTO[];
 }
 
 export interface CreateChartFilterDTO {
   id: string;
   dataDefinitionId: string;
+  labelDefault: string;
   filterType: FilterType;
   filterValues: CreateChartFilterValueDTO[];
   filterDynamic: boolean;
+  translations: ChartFilterTranslationDTO[];
+
 }

package/models/charts/chartFilterTranslation.ts

@@ -0,0 +1,14 @@
+export class ChartFilterTranslation {
+    languageCode: string;
+    label: string;
+  
+    constructor(params: ChartFilterTranslationDTO) {
+      this.languageCode = params.languageCode;
+      this.label = params.label;
+    }
+  }
+  
+  export interface ChartFilterTranslationDTO {
+    languageCode: string;
+    label: string;
+  }

package/models/charts/chartPresetFilter.ts

@@ -3,6 +3,7 @@ export class ChartPresetFilter {
   chartPresetId: string;
   chartPresetLabel: string;
   chartFilterId: string;
+  chartFilterLabel: string;
 
 
   constructor(params: ChartPresetFilterDTO) {
@@ -10,6 +11,7 @@ export class ChartPresetFilter {
     this.chartPresetId = params.chartPresetId;
     this.chartPresetLabel = params.chartPresetLabel;
     this.chartFilterId = params.chartFilterId;
+    this.chartFilterLabel = params.chartFilterLabel;
   }
 }
 
@@ -18,6 +20,7 @@ export interface ChartPresetFilterDTO {
   chartPresetId: string;
   chartPresetLabel: string;
   chartFilterId: string;
+  chartFilterLabel: string;
 }
 
 export interface CreateChartPresetFilterDTO {

package/models/charts/index.ts

@@ -1,6 +1,7 @@
 export * from "./chartAxis";
 export * from "./chartDetails";
 export * from "./chartFilter";
+export * from "./chartFilterTranslation";
 export * from "./chartFilterValue";
 export * from "./chartInfos";
 export * from "./chartModelLabel";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-domain",
   "sideEffects": false,
-  "version": "0.0.141",
+  "version": "0.0.142",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -9,5 +9,5 @@
   "main": "index.ts",
   "author": "",
   "license": "ISC",
-  "gitHead": "c318ee98722b674ed4f4264333aeebe65be23785"
+  "gitHead": "c0fdd8e9613d0cf329051814e660f7c298d76be7"
 }