first draft of multiple value sets

Author: Shayan1375

src/app/model/FeasibilityQuery/Criterion/AttributeFilter/AttributeFiltersBuilder.ts

@@ -118,8 +118,8 @@ export class AttributeFiltersBuilder {
     return new QuantityNotSet(allowedUnits, selectedUnit, precision);
   }
 
-  buildConceptFilter(id: string, allowedConceptUri: string, selectedConcepts?: Concept[]) {
-    return new ConceptFilter(id, [allowedConceptUri], selectedConcepts);
+  buildConceptFilter(id: string, allowedConceptUri: string[], selectedConcepts?: Concept[]) {
+    return new ConceptFilter(id, allowedConceptUri, selectedConcepts);
   }
 
   /**

src/app/model/Interface/AttributeDefinitionData.ts

@@ -12,7 +12,7 @@ export interface AttributeDefinitionData {
   optional: boolean
   precision: number
   referencedCriteriaSet?: string
-  referencedValueSet?: string
+  referencedValueSet?: string[]
   selectableConcepts: string[]
   type: FilterTypes
 }

src/app/model/Interface/ValueDefinition.ts

@@ -10,7 +10,7 @@ export interface ValueDefinitionData {
   allowedUnits: QuantityUnitData[]
   precision: number
   referencedCriteriaSet?: string
-  referencedValueSet?: string
+  referencedValueSet?: string[]
   max: number
   min: number
 }

src/app/model/Utilities/AttributeDefinition.ts/AbstractAttributeDefinition.ts

@@ -9,7 +9,7 @@ export abstract class AbstractAttributeDefinition {
   protected optional = false;
   protected precision = 1;
   protected type: FilterTypes;
-  protected referencedValueSet?: string;
+  protected referencedValueSet?: string[];
   protected display: Display;
 
   constructor(
@@ -20,7 +20,7 @@ export abstract class AbstractAttributeDefinition {
     max?: number,
     min?: number,
     precision: number = 1,
-    referencedValueSet?: string
+    referencedValueSet?: string[]
   ) {
     this.display = display;
     this.type = type;
@@ -88,11 +88,11 @@ export abstract class AbstractAttributeDefinition {
     this.precision = precision;
   }
 
-  getReferencedValueSet(): string {
+  getReferencedValueSet(): string[] {
     return this.referencedValueSet;
   }
 
-  setReferencedValueSet(referencedValueSet: string): void {
+  setReferencedValueSet(referencedValueSet: string[]): void {
     this.referencedValueSet = referencedValueSet;
   }
 }

src/app/model/Utilities/AttributeDefinition.ts/AttributeDefinitions.ts

@@ -18,7 +18,7 @@ export class AttributeDefinitions extends AbstractAttributeDefinition {
     min?: number,
     precision: number = 1,
     referenceCriteriaSet?: string,
-    referencedValueSet?: string
+    referencedValueSet?: string[]
   ) {
     super(display, type, optional, allowedUnits, max, min, precision, referencedValueSet);
     this.attributeCode = attributeCode;

src/app/model/Utilities/AttributeDefinition.ts/ValueDefnition.ts

@@ -12,7 +12,7 @@ export class ValueDefinition extends AbstractAttributeDefinition {
     max?: number,
     min?: number,
     precision: number = 1,
-    referencedValueSet?: string
+    referencedValueSet?: string[]
   ) {
     super(display, type, optional, allowedUnits, max, min, precision, referencedValueSet);
   }

src/app/service/Criterion/Builder/AttributeDefinitionFactory/AttributeDefinitionToAttributeFilterBuilderHelper.service.ts

@@ -56,7 +56,7 @@ export class AttributeDefinitionToAttributeFilterBuilderHelperService {
     builder: AttributeFiltersBuilder
   ): void {
     builder.withConcept(
-      new ConceptFilter(uuidv4(), [abstractAttributeDefinition.getReferencedValueSet()], [])
+      new ConceptFilter(uuidv4(), abstractAttributeDefinition.getReferencedValueSet(), [])
     );
   }
 

src/app/service/Error/GlobalErrorHandler.service.ts

@@ -4,7 +4,6 @@ import { CodeableConceptResultListEntry } from 'src/app/model/Search/ListEntries
 import { CodeableConceptResultMapperStrategy } from '../Mapper/CodeableConceptResultMapperStrategy';
 import { CodeableConceptSearchUrlStrategy } from '../Url/CodeableConceptSearchUrlStrategy';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
 import { SearchEngine } from '../../../SearchEngine';
 
 @Injectable({