update referencedCriteriaSet to use string arrays in multiple interfaces and classes

Author: Shayan1375

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

@@ -129,7 +129,7 @@ export class AttributeFiltersBuilder {
    */
   buildReferenceFilter(
     id: string,
-    allowedReferenceUri: string,
+    allowedReferenceUri: string[],
     selectedReference?: ReferenceCriterion[],
     selectedConcepts?: Concept[]
   ): ReferenceFilter {

src/app/model/FeasibilityQuery/Criterion/AttributeFilter/Concept/ReferenceFilter.ts

@@ -1,15 +1,14 @@
 import { AbstractConceptFilter } from './AbstractConceptFilter';
+import { Concept } from './Concept';
 import { FilterTypes } from 'src/app/model/Utilities/FilterTypes';
 import { ReferenceCriterion } from '../../ReferenceCriterion';
-import { TerminologyCode } from 'src/app/model/Terminology/TerminologyCode';
-import { Concept } from './Concept';
 
 /**
  * Class representing a ReferenceFilter.
  */
 export class ReferenceFilter extends AbstractConceptFilter {
+  private allowedReferenceUri: string[];
   private selectedReferences: ReferenceCriterion[] = [];
-  private allowedReferenceUri: string;
   private type: FilterTypes = FilterTypes.REFERENCE;
 
   /**
@@ -21,7 +20,7 @@ export class ReferenceFilter extends AbstractConceptFilter {
    */
   constructor(
     id: string,
-    allowedReferenceUri: string,
+    allowedReferenceUri: string[],
     selectedReferences: ReferenceCriterion[] = [],
     selectedConcepts: Concept[]
   ) {
@@ -35,7 +34,7 @@ export class ReferenceFilter extends AbstractConceptFilter {
    *
    * @returns An array of selected reference criteria.
    */
-  getSelectedReferences(): ReferenceCriterion[] {
+  public getSelectedReferences(): ReferenceCriterion[] {
     return this.selectedReferences;
   }
 
@@ -44,7 +43,7 @@ export class ReferenceFilter extends AbstractConceptFilter {
    *
    * @param selectedReferences - An array of selected reference criteria.
    */
-  setSelectedReferences(selectedReferences: ReferenceCriterion[]): void {
+  public setSelectedReferences(selectedReferences: ReferenceCriterion[]): void {
     this.selectedReferences = selectedReferences;
   }
 
@@ -53,7 +52,7 @@ export class ReferenceFilter extends AbstractConceptFilter {
    *
    * @returns The allowed reference URI.
    */
-  getAllowedReferenceUri(): string {
+  public getAllowedReferenceUri(): string[] {
     return this.allowedReferenceUri;
   }
 
@@ -62,7 +61,7 @@ export class ReferenceFilter extends AbstractConceptFilter {
    *
    * @param allowedReferenceUri - The allowed reference URI to set.
    */
-  setAllowedReferenceUri(allowedReferenceUri: string): void {
+  public setAllowedReferenceUri(allowedReferenceUri: string[]): void {
     this.allowedReferenceUri = allowedReferenceUri;
   }
 
@@ -71,7 +70,7 @@ export class ReferenceFilter extends AbstractConceptFilter {
    *
    * @returns The filter type.
    */
-  getType(): FilterTypes {
+  public getType(): FilterTypes {
     return this.type;
   }
 
@@ -80,7 +79,7 @@ export class ReferenceFilter extends AbstractConceptFilter {
    *
    * @param type - The new filter type.
    */
-  setType(type: FilterTypes): void {
+  public setType(type: FilterTypes): void {
     this.type = type;
   }
 
@@ -92,16 +91,16 @@ export class ReferenceFilter extends AbstractConceptFilter {
    * @param selectedConcepts - The selected concepts.
    * @returns The created ReferenceFilter instance.
    */
-  static create(
+  public static create(
     id: string,
-    allowedReferenceUri: string,
+    allowedReferenceUri: string[],
     selectedReference: ReferenceCriterion[] = [],
     selectedConcepts: Concept[]
   ): ReferenceFilter {
     return new ReferenceFilter(id, allowedReferenceUri, selectedReference, selectedConcepts);
   }
 
-  isSelectedReferenceSet(): boolean {
+  public isSelectedReferenceSet(): boolean {
     return (
       this.selectedReferences !== undefined &&
       this.selectedReferences !== null &&

src/app/model/Interface/AttributeDefinitionData.ts

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

src/app/model/Interface/ValueDefinition.ts

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

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

@@ -6,7 +6,7 @@ import { TerminologyCode } from '../../Terminology/TerminologyCode';
 
 export class AttributeDefinitions extends AbstractAttributeDefinition {
   private attributeCode?: TerminologyCode;
-  private referencedCriteriaSet?: string;
+  private referencedCriteriaSet?: string[];
 
   constructor(
     display: Display,
@@ -17,7 +17,7 @@ export class AttributeDefinitions extends AbstractAttributeDefinition {
     max?: number,
     min?: number,
     precision: number = 1,
-    referenceCriteriaSet?: string,
+    referenceCriteriaSet?: string[],
     referencedValueSet?: string[]
   ) {
     super(display, type, optional, allowedUnits, max, min, precision, referencedValueSet);
@@ -33,11 +33,11 @@ export class AttributeDefinitions extends AbstractAttributeDefinition {
     this.attributeCode = attributeCode;
   }
 
-  public getReferenceCriteriaSet(): string {
+  public getReferenceCriteriaSet(): string[] {
     return this.referencedCriteriaSet;
   }
 
-  public setReferenceCriteriaSet(referenceCriteriaSet: string | undefined): void {
+  public setReferenceCriteriaSet(referenceCriteriaSet: string[]): void {
     this.referencedCriteriaSet = referenceCriteriaSet;
   }
 }