From 703c5229273b60c68bc7d19f5a4d7aa19a65ccf9 Mon Sep 17 00:00:00 2001 From: Desy Ayurianti Date: Thu, 28 Nov 2024 13:18:41 +0700 Subject: [PATCH] fix(dashboard+graph): fix dropdown in sesnor npk --- .../src/app/pages/dashboard/dashboard.component.html | 2 +- .../pages/dashboard/page/graph/graph.component.html | 12 +++++++++--- .../pages/dashboard/page/graph/graph.component.ts | 8 ++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/agrilink_vocpro/src/app/pages/dashboard/dashboard.component.html b/agrilink_vocpro/src/app/pages/dashboard/dashboard.component.html index 70fad21..fb261c5 100644 --- a/agrilink_vocpro/src/app/pages/dashboard/dashboard.component.html +++ b/agrilink_vocpro/src/app/pages/dashboard/dashboard.component.html @@ -5,7 +5,7 @@
- + diff --git a/agrilink_vocpro/src/app/pages/dashboard/page/graph/graph.component.html b/agrilink_vocpro/src/app/pages/dashboard/page/graph/graph.component.html index 70f8098..59c787f 100644 --- a/agrilink_vocpro/src/app/pages/dashboard/page/graph/graph.component.html +++ b/agrilink_vocpro/src/app/pages/dashboard/page/graph/graph.component.html @@ -17,7 +17,7 @@
-
Sensor BHT
+
Sensor DHT
@@ -34,7 +34,10 @@
Sensor NPK 1
@@ -53,7 +56,10 @@
Sensor NPK 2
diff --git a/agrilink_vocpro/src/app/pages/dashboard/page/graph/graph.component.ts b/agrilink_vocpro/src/app/pages/dashboard/page/graph/graph.component.ts index 14ca4cc..d727f09 100644 --- a/agrilink_vocpro/src/app/pages/dashboard/page/graph/graph.component.ts +++ b/agrilink_vocpro/src/app/pages/dashboard/page/graph/graph.component.ts @@ -347,6 +347,14 @@ export class GraphComponent implements OnInit, AfterViewInit, OnDestroy, OnChang return ['soilphosphorus', 'soilnitrogen', 'soilpotassium'].includes(parameter); } else if (selectedOption === 'others') { return !['soilphosphorus', 'soilnitrogen', 'soilpotassium'].includes(parameter); + } else if (selectedOption === 'temperature') { + return ['soiltemperature'].includes(parameter); + } else if (selectedOption === 'humidity') { + return ['soilhumidity'].includes(parameter); + } else if (selectedOption === 'conductivity') { + return ['soilconductivity'].includes(parameter); + } else if (selectedOption === 'ph') { + return ['soilph'].includes(parameter); } return true; })