@dative-gpi/foundation-core-domain 0.0.159 → 0.0.160

package/models/dashboardOrganisationTypes/dashboardOrganisationTypeDetails.ts

@@ -33,6 +33,8 @@ export class DashboardOrganisationTypeDetails extends DashboardOrganisationTypeI
     this.entityPresetCode = params.entityPresetCode;
     this.datePresetCode = params.datePresetCode;
     this.variableCode = params.variableCode;
+    this.datePresets = params.datePresets.map(dto => new DashboardDatePresetInfos(dto));
+    this.entityPresets = params.entityPresets.map(dto => new DashboardEntityPresetInfos(dto));
     this.variables = params.variables.map(dto => new DashboardVariableInfos(dto));
     this.widgets = params.widgets.map(dto => new WidgetInfos(dto));
   }

package/models/dashboardShallowVariables/dashboardShallowVariableDetails.ts

@@ -1,8 +1,8 @@
-import { DashboardVariableValueTranslationDTO } from "../dashboardVariables/dashboardVariableValueTranslation";
+import { CreateDashboardVariableValueDTO } from "../dashboardVariableValues";
 
 export interface CreateDashboardShallowVariableDTO {
   code: string;
   defaultValue: string;
   useOnlyAllowedValues: boolean;
-  allowedValues: { [key: string]: DashboardVariableValueTranslationDTO[] };
+  allowedValues: CreateDashboardVariableValueDTO[];
 }

package/models/dashboardShallowVariables/dashboardShallowVariableInfos.ts

@@ -1,4 +1,4 @@
-import { DashboardVariableValueTranslation, DashboardVariableValueTranslationDTO } from "../dashboardVariables/dashboardVariableValueTranslation";
+import { DashboardVariableValue, DashboardVariableValueDTO } from "../dashboardVariableValues";
 
 export class DashboardShallowVariableInfos {
   id: string;
@@ -6,7 +6,7 @@ export class DashboardShallowVariableInfos {
   code: string;
   defaultValue: string;
   useOnlyAllowedValues: boolean;
-  allowedValues: { [key: string]: DashboardVariableValueTranslation[] };
+  allowedValues: DashboardVariableValue[];
 
   constructor(params: DashboardShallowVariableInfosDTO) {
     this.id = params.id;
@@ -14,7 +14,7 @@ export class DashboardShallowVariableInfos {
     this.code = params.code;
     this.defaultValue = params.defaultValue;
     this.useOnlyAllowedValues = params.useOnlyAllowedValues;
-    this.allowedValues = { ...params.allowedValues };
+    this.allowedValues = params.allowedValues.map(dto => new DashboardVariableValue(dto));
   }
 }
   
@@ -24,5 +24,5 @@ export interface DashboardShallowVariableInfosDTO {
   code: string;
   defaultValue: string;
   useOnlyAllowedValues: boolean;
-  allowedValues: { [key: string]: DashboardVariableValueTranslationDTO[] };
+  allowedValues: DashboardVariableValueDTO[];
 }

package/models/dashboardVariableValues/dashboardVariableValue.ts

@@ -0,0 +1,28 @@
+import { DashboardVariableValueTranslation, DashboardVariableValueTranslationDTO } from "./dashboardVariableValueTranslation";
+
+export class DashboardVariableValue {
+  value: string;
+  label: string;
+  labelDefault: string;
+  translations: DashboardVariableValueTranslation[];
+
+  constructor(params: DashboardVariableValueDTO) {
+    this.value = params.value;
+    this.label = params.label;
+    this.labelDefault = params.labelDefault;
+    this.translations = params.translations.map(t => new DashboardVariableValueTranslation(t));
+  }
+}
+
+export interface DashboardVariableValueDTO {
+  value: string;
+  label: string;
+  labelDefault: string;
+  translations: DashboardVariableValueTranslationDTO[];
+}
+
+export interface CreateDashboardVariableValueDTO {
+  value: string;
+  labelDefault: string;
+  translations: DashboardVariableValueTranslationDTO[];
+}

package/models/{dashboardVariables → dashboardVariableValues}/dashboardVariableValueTranslation.ts

@@ -2,7 +2,7 @@ export class DashboardVariableValueTranslation {
   languageCode: string;
   label: string;
 
-  constructor(params: DashboardVariableValueTranslationDTO) {
+  constructor (params: DashboardVariableValueTranslationDTO) {
     this.languageCode = params.languageCode;
     this.label = params.label;
   }

package/models/dashboardVariableValues/index.ts

@@ -0,0 +1,2 @@
+export * from "./dashboardVariableValue";
+export * from "./dashboardVariableValueTranslation";

package/models/dashboardVariables/dashboardVariableDetails.ts

@@ -1,7 +1,7 @@
 import { DashboardVariableType } from "@dative-gpi/foundation-shared-domain/models";
 
-import { DashboardVariableValueTranslationDTO } from "./dashboardVariableValueTranslation";
 import { DashboardVariableTranslationDTO } from "./dashboardVariableTranslation";
+import { CreateDashboardVariableValueDTO } from "../dashboardVariableValues";
 
 export interface CreateDashboardVariableDTO {
   variableType: DashboardVariableType;
@@ -9,6 +9,6 @@ export interface CreateDashboardVariableDTO {
   code: string;
   defaultValue: string;
   useOnlyAllowedValues: boolean;
-  allowedValues: { [key: string]: DashboardVariableValueTranslationDTO[] };
+  allowedValues: CreateDashboardVariableValueDTO[];
   translations: DashboardVariableTranslationDTO[];
 }

package/models/dashboardVariables/dashboardVariableInfos.ts

@@ -1,7 +1,7 @@
 import { DashboardVariableType } from "@dative-gpi/foundation-shared-domain/models";
 
-import { DashboardVariableValueTranslation, DashboardVariableValueTranslationDTO } from "./dashboardVariableValueTranslation";
 import { DashboardVariableTranslation, DashboardVariableTranslationDTO } from "./dashboardVariableTranslation";
+import { DashboardVariableValue, DashboardVariableValueDTO } from "../dashboardVariableValues";
 
 export class DashboardVariableInfos {
   variableType: DashboardVariableType;
@@ -10,7 +10,7 @@ export class DashboardVariableInfos {
   code: string;
   defaultValue: string;
   useOnlyAllowedValues: boolean;
-  allowedValues: { [key: string]: DashboardVariableValueTranslation[] };
+  allowedValues: DashboardVariableValue[];
   translations: DashboardVariableTranslation[];
 
   constructor(params: DashboardVariableInfosDTO) {
@@ -20,7 +20,7 @@ export class DashboardVariableInfos {
     this.code = params.code;
     this.defaultValue = params.defaultValue;
     this.useOnlyAllowedValues = params.useOnlyAllowedValues;
-    this.allowedValues = { ...params.allowedValues };
+    this.allowedValues = params.allowedValues.map(dto => new DashboardVariableValue(dto));
     this.translations = params.translations.map(t => new DashboardVariableTranslation(t));
   }
 }
@@ -32,6 +32,6 @@ export interface DashboardVariableInfosDTO {
   code: string;
   defaultValue: string;
   useOnlyAllowedValues: boolean;
-  allowedValues: { [key: string]: DashboardVariableValueTranslationDTO[] };
+  allowedValues: DashboardVariableValueDTO[];
   translations: DashboardVariableTranslationDTO[];
 }

package/models/dashboardVariables/index.ts

@@ -1,4 +1,3 @@
 export * from "./dashboardVariableDetails";
 export * from "./dashboardVariableInfos";
-export * from "./dashboardVariableTranslation"
-export * from "./dashboardVariableValueTranslation";
+export * from "./dashboardVariableTranslation";

package/models/index.ts

@@ -20,6 +20,7 @@ export * from "./dashboardShallowEntityPresets";    // No service
 export * from "./dashboardShallows";
 export * from "./dashboardShallowVariables";        // No service
 export * from "./dashboardVariables";               // No service
+export * from "./dashboardVariableValues";          // No service
 export * from "./dataCategories";
 export * from "./dataDefinitions";
 export * from "./dataDefinitionMappings";           // No service

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-domain",
   "sideEffects": false,
-  "version": "0.0.159",
+  "version": "0.0.160",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -9,5 +9,5 @@
   "main": "index.ts",
   "author": "",
   "license": "ISC",
-  "gitHead": "06e6dd8faf89e9617cf5ee586b8a0d1e2cfdbe47"
+  "gitHead": "fb4e1055e6dcf28c07dd57ab94cccc303e98ebbb"
 }