bugfix (Issue #111): remove attributefilter in the structured query, …

…where no concepts are selected

removed unnecessary console.logs

src/app/modules/querybuilder/components/querybuilder-editor/display/display-entities/display-entities.component.ts

@@ -32,7 +32,6 @@ export class DisplayEntitiesComponent implements OnInit {
         child.valueFilters[0].selectedConcepts = child.valueDefinitions[0].selectableConcepts
       })
     })
-    console.log(this.critGroup)
   }
 
   getInnerLabelKey(): 'AND' | 'OR' {

src/app/modules/querybuilder/components/querybuilder-editor/display/display-value-filter/display-value-filter.component.html

@@ -1,5 +1,8 @@
-<div *ngIf="filter" class="container">
-  <div *ngIf="filter.type === OperatorOptions.CONCEPT">
+<div *ngIf="filter">
+  <div
+    *ngIf="filter.type === OperatorOptions.CONCEPT && filter.selectedConcepts.length > 0"
+    class="container"
+  >
     <span *ngIf="filter.display">{{ filter.display }}{{ ': ' }}</span>
     <span *ngIf="filter.attributeDefinition?.attributeCode?.display"
       >{{ filter.attributeDefinition?.attributeCode?.display }}{{ ': ' }}</span
@@ -14,7 +17,7 @@
     </span>
   </div>
 
-  <div *ngIf="filter.type === OperatorOptions.QUANTITY_COMPARATOR">
+  <div *ngIf="filter.type === OperatorOptions.QUANTITY_COMPARATOR" class="container">
     <span *ngIf="filter.display">{{ filter.display }}{{ ': ' }}</span>
     <span *ngIf="filter.attributeDefinition?.attributeCode?.display"
       >{{ filter.attributeDefinition?.attributeCode?.display }}{{ ': ' }}</span
@@ -31,7 +34,7 @@
     }}
   </div>
 
-  <div *ngIf="filter.type === OperatorOptions.QUANTITY_RANGE">
+  <div *ngIf="filter.type === OperatorOptions.QUANTITY_RANGE" class="container">
     <span *ngIf="filter.display">{{ filter.display }}{{ ': ' }}</span>
     <span *ngIf="filter.attributeDefinition?.attributeCode?.display"
       >{{ filter.attributeDefinition?.attributeCode?.display }}{{ ': ' }}</span

src/app/modules/querybuilder/components/querybuilder-editor/edit/edit-value-filter/edit-value-filter.component.ts

@@ -32,7 +32,6 @@ export class EditValueFilterComponent implements OnInit {
   constructor() {}
 
   ngOnInit(): void {
-    console.log(this.filter)
     this.filter?.selectedConcepts.forEach((concept) =>
       this.selectedConceptsAsJson.add(JSON.stringify(concept))
     )

src/app/modules/querybuilder/components/querybuilder-editor/edit/enter-criterion-list/enter-criterion-list.component.ts

@@ -59,7 +59,6 @@ export class EnterCriterionListComponent implements OnInit {
         isAddible: undefined,
       })
     })
-    console.log(this.criterionList)
   }
 
   doSave(event: { groupId: number }, criterion: Criterion): void {

src/app/modules/querybuilder/controller/ApiTranslator.ts

@@ -109,8 +109,14 @@ export class ApiTranslator {
           criterionV2.valueFilter.valueDefinition = undefined
         }
         if (criterion.attributeFilters?.length > 0) {
-          criterionV2.attributeFilters = criterion.attributeFilters
-          criterionV2.attributeFilters.forEach((attribute) => {
+          criterion.attributeFilters.forEach((attribute) => {
+            if (attribute.type === OperatorOptions.CONCEPT) {
+              if (attribute.selectedConcepts.length > 0) {
+                criterionV2.attributeFilters.push(attribute)
+              }
+            } else {
+              criterionV2.attributeFilters.push(attribute)
+            }
             attribute.attributeCode = attribute.attributeDefinition.attributeCode
           })
         }