From 67ea0587db4df687982dca5babaf0c2a27450a0b Mon Sep 17 00:00:00 2001
From: Patrick Gebhardt <pjgebhardt@icloud.com>
Date: Thu, 25 Jun 2020 22:18:21 +0200
Subject: [PATCH] Fix advanced search

---
 .../search-input/search-input.component.html         |  2 +-
 .../search-input/search-input.component.ts           | 12 +++++++++---
 frontend/src/app/utils/toMinMaxArray.ts              |  7 +++++++
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/app/utils/toMinMaxArray.ts

diff --git a/frontend/src/app/components/search-input/search-input.component.html b/frontend/src/app/components/search-input/search-input.component.html
index 2ea92f0..fe9661e 100644
--- a/frontend/src/app/components/search-input/search-input.component.html
+++ b/frontend/src/app/components/search-input/search-input.component.html
@@ -108,7 +108,7 @@
           <span class="title">Financial</span>
           <span class="desc">| sweetspot selection (€/day)</span>
         </div>
-        <app-toggle-slider [(model)]="costPerDay" [label]="'Cost'" [max]="400" [min]="0"></app-toggle-slider>
+        <app-toggle-slider [(model)]="costPerDay" [label]="'Total cost'" [max]="400" [min]="0"></app-toggle-slider>
         <app-toggle-slider [(model)]="accommodation" [label]="'Accommodation'" [max]="200"
                            [min]="0"></app-toggle-slider>
         <app-toggle-slider [(model)]="localTransport" [label]="'Local transport'" [max]="20"
diff --git a/frontend/src/app/components/search-input/search-input.component.ts b/frontend/src/app/components/search-input/search-input.component.ts
index d47320e..41fee6b 100644
--- a/frontend/src/app/components/search-input/search-input.component.ts
+++ b/frontend/src/app/components/search-input/search-input.component.ts
@@ -6,6 +6,7 @@ import {PresetService} from '../../services/preset.service';
 import {Preset} from '../../interfaces/preset.interface';
 import {formatDate} from '@angular/common';
 import {SearchService} from '../../services/search.service';
+import {toMinMaxArray} from '../../utils/toMinMaxArray';
 
 @Component({
   selector: 'app-search-input',
@@ -137,9 +138,14 @@ export class SearchInputComponent implements OnInit {
       query.textfilter = this.textFilter;
     }
 
-    query.temperature_mean_max = this.temperatureMeanMax ? [this.temperatureMeanMax, this.temperatureMeanMax] : undefined;
-    query.precipitation = this.precipitation ? [this.precipitation, this.precipitation] : undefined;
-    query.accommodation_costs = this.accommodation ? [this.accommodation, this.accommodation] : undefined;
+    query.temperature_mean_max = toMinMaxArray(this.temperatureMeanMax);
+    query.precipitation = toMinMaxArray(this.precipitation);
+    query.sun_hours = toMinMaxArray(this.sunHours);
+    query.rain_days = toMinMaxArray(this.rainDays);
+    query.average_per_day_costs = toMinMaxArray(this.costPerDay);
+    query.accommodation_costs = toMinMaxArray(this.accommodation);
+    query.entertainment_costs = toMinMaxArray(this.entertainment);
+    query.local_transportation_costs = toMinMaxArray(this.localTransport);
 
     return query;
   }
diff --git a/frontend/src/app/utils/toMinMaxArray.ts b/frontend/src/app/utils/toMinMaxArray.ts
new file mode 100644
index 0000000..f25481d
--- /dev/null
+++ b/frontend/src/app/utils/toMinMaxArray.ts
@@ -0,0 +1,7 @@
+/**
+ * Transforms a value into a min max array.
+ * @param value The value
+ */
+export function toMinMaxArray(value: number): number[] {
+  return value ? [value, value] : undefined;
+}