From 075665c588989ed0decdfb20d83f32b33eed4639 Mon Sep 17 00:00:00 2001 From: Marius Peter Date: Fri, 29 Aug 2025 14:22:37 +0200 Subject: Properly implement bed and raft management logic. --- .../dashboard/_nutrient_measurements.html.erb | 22 ++++++++++++++++++++++ app/views/dashboard/_raft_allocation.html.erb | 4 ++-- app/views/dashboard/_recent_measurements.html.erb | 22 ---------------------- app/views/dashboard/index.html.erb | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 app/views/dashboard/_nutrient_measurements.html.erb delete mode 100644 app/views/dashboard/_recent_measurements.html.erb (limited to 'app/views/dashboard') diff --git a/app/views/dashboard/_nutrient_measurements.html.erb b/app/views/dashboard/_nutrient_measurements.html.erb new file mode 100644 index 0000000..bc63a60 --- /dev/null +++ b/app/views/dashboard/_nutrient_measurements.html.erb @@ -0,0 +1,22 @@ +
+
+
Nutrient Measurements
+
+ <%#= link_to "Add new measurement", editor_rafts_path, class: "btn btn-sm btn-primary" %> + <%#= link_to "View all", editor_rafts_path, class: "btn btn-sm btn-secondary" %> +
+
+ +
+
+ <%= line_chart @npk_measurement_data, + title: "NPK", + ytitle: "Concentration (mg/L)" %> +
+
+ <%= line_chart @ammonium_measurement_data, + title: "Ammonium", + ytitle: "Concentration (mg/L)" %> +
+
+
diff --git a/app/views/dashboard/_raft_allocation.html.erb b/app/views/dashboard/_raft_allocation.html.erb index ef95cdd..a2128ea 100644 --- a/app/views/dashboard/_raft_allocation.html.erb +++ b/app/views/dashboard/_raft_allocation.html.erb @@ -1,7 +1,7 @@
-
Raft Allocation
- <%= link_to "Edit raft allocation", editor_rafts_path, class: "btn btn-sm btn-primary" %> +
Crop Allocation
+ <%= link_to "Edit allocation", beds_path, class: "btn btn-sm btn-primary" %>
<%= bar_chart @raft_data, stacked: true %> diff --git a/app/views/dashboard/_recent_measurements.html.erb b/app/views/dashboard/_recent_measurements.html.erb deleted file mode 100644 index bc63a60..0000000 --- a/app/views/dashboard/_recent_measurements.html.erb +++ /dev/null @@ -1,22 +0,0 @@ -
-
-
Nutrient Measurements
-
- <%#= link_to "Add new measurement", editor_rafts_path, class: "btn btn-sm btn-primary" %> - <%#= link_to "View all", editor_rafts_path, class: "btn btn-sm btn-secondary" %> -
-
- -
-
- <%= line_chart @npk_measurement_data, - title: "NPK", - ytitle: "Concentration (mg/L)" %> -
-
- <%= line_chart @ammonium_measurement_data, - title: "Ammonium", - ytitle: "Concentration (mg/L)" %> -
-
-
diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 2902ada..b1b2d87 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -4,4 +4,4 @@ <%= render "target_table" %> -<%= render "recent_measurements" %> +<%= render "nutrient_measurements" %> -- cgit v1.2.3