From fa77a691ce0cc8941fe470a762f352b27f4f0563 Mon Sep 17 00:00:00 2001 From: Marius Peter Date: Sun, 23 Nov 2025 17:54:45 +0100 Subject: Last commit. --- .../_nutrient_measurements_table.html.erb | 4 +- .../dashboard/_nutrient_target_table.html.erb | 35 ++++----- app/views/dashboard/_raft_allocation.html.erb | 9 --- app/views/dashboard/_target_table.html.erb | 39 ---------- app/views/dashboard/index.html.erb | 4 - app/views/targets/index.html.erb | 34 +++------ app/views/targets/new.html.erb | 85 ---------------------- 7 files changed, 26 insertions(+), 184 deletions(-) delete mode 100644 app/views/dashboard/_raft_allocation.html.erb delete mode 100644 app/views/dashboard/_target_table.html.erb (limited to 'app/views') diff --git a/app/views/dashboard/_nutrient_measurements_table.html.erb b/app/views/dashboard/_nutrient_measurements_table.html.erb index 82ea6ff..4d516bd 100644 --- a/app/views/dashboard/_nutrient_measurements_table.html.erb +++ b/app/views/dashboard/_nutrient_measurements_table.html.erb @@ -2,8 +2,8 @@

Relevé des Nutriments

- <%= link_to "Ajouter un relevé", new_nutrient_measurement_path, class: "btn btn-sm btn-primary" %> - <%= link_to "Liste des relevés", nutrient_measurements_path, class: "btn btn-sm btn-secondary" %> + <%= link_to "Ajouter un relevé", new_nutrient_measurement_path, class: "btn btn-sm btn-outline-primary" %> + <%= link_to "Liste des relevés", nutrient_measurements_path, class: "btn btn-sm btn-outline-secondary" %>
diff --git a/app/views/dashboard/_nutrient_target_table.html.erb b/app/views/dashboard/_nutrient_target_table.html.erb index 7cf294c..006d262 100644 --- a/app/views/dashboard/_nutrient_target_table.html.erb +++ b/app/views/dashboard/_nutrient_target_table.html.erb @@ -2,40 +2,33 @@

Complémentation

- <%= link_to "Nouvelle cible", new_target_path, class: "btn btn-sm btn-primary" %> - <%= link_to "Voir la recette", root_path, class: "btn btn-sm btn-secondary" %> + <%= link_to "Nouvelle cible", new_target_path, class: "btn btn-sm btn-outline-primary" %> + <%= link_to "Liste des cibles", targets_path, class: "btn btn-sm btn-outline-secondary" %> + <%= link_to "Voir la recette", root_path, class: "btn btn-sm btn-outline-secondary" %>
- +
- - + + - <% wr = @weighted || {} %> - <% lm = @latest_measurements || {} %> + <% Nutrient.all.each do |nutrient| %> + <% measured = @latest_measurement.send(nutrient.formula.downcase) %> + <% target = @latest_target.send(nutrient.formula.downcase) %> + <% delta = (target.to_f - measured.to_f) / 100.0 if measured || target %> - <% keys = (wr.keys + lm.keys).map(&:to_s).uniq.sort %> - <% keys.each do |nut| %> - <% measured = lm[nut] %> - <% target = wr[nut] %> - <% delta = (measured.to_f - target.to_f) if measured || target %> - - +
Nutriment RelevéCibleDelta<%= @latest_target&.name || "Cible" %>Delta (%)
<%= nut.upcase %><%= nutrient.formula %> - <% if measured.nil? %> - — - <% else %> - <%= number_with_precision(measured, precision: 2) %> - <% end %> + <%= measured.present? ? number_with_precision(measured, precision: 2) : — %> @@ -50,7 +43,7 @@ <% if measured.nil? && target.nil? %> — <% else %> - <% badge = + <% badge_class = if delta.nil? "text-bg-secondary" elsif delta.abs <= 0.01 @@ -60,7 +53,7 @@ else "text-bg-danger" end %> - + <%= number_with_precision(delta.to_f, precision: 2) %> <% end %> diff --git a/app/views/dashboard/_raft_allocation.html.erb b/app/views/dashboard/_raft_allocation.html.erb deleted file mode 100644 index 1c9ef9a..0000000 --- a/app/views/dashboard/_raft_allocation.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -
-
-
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/_target_table.html.erb b/app/views/dashboard/_target_table.html.erb deleted file mode 100644 index b1553dc..0000000 --- a/app/views/dashboard/_target_table.html.erb +++ /dev/null @@ -1,39 +0,0 @@ -
-
-
Target nutrient concentrations
- <%= link_to "Get Ferti© recipe", ferti_recipe_path, class: "btn btn-sm btn-primary" %> -
- -
- - - - - - - - - - - <% NutrientsHelper::NUTRIENTS.each do |n| %> - <% latest = @latest_measurement[n] || 0 %> - <% target = @target[n] || 0 %> - <% delta = target - latest %> - - - - - - - <% end %> - -
Nutrient Latest (mg/L)Target (mg/L)Δ %
<%= n.upcase %><%= fmt(latest) %><%= fmt(target) %> - - <%= fmt(delta) %>% - -
-
-
- Latest measurement: <%= @latest_measurement.measured_on || "none yet" %> -
-
diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index a954e4c..50fab18 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -2,8 +2,4 @@ <%= render "nutrient_target_table", nutrient_profiles: @nutrient_profiles %> -<%#= render "raft_allocation" %> - -<%#= render "target_table" %> - <%= render "nutrient_measurements_table" %> diff --git a/app/views/targets/index.html.erb b/app/views/targets/index.html.erb index b552038..e536deb 100644 --- a/app/views/targets/index.html.erb +++ b/app/views/targets/index.html.erb @@ -5,31 +5,29 @@
- +
- - - - + + <% if @targets.present? %> - <% @targets.each do |t| %> - <% sum_pct = t.target_allocations.sum { |a| a.percentage.to_f } %> + <% @targets.each do |target| %> + <% sum_pct = target.allocations.sum { |a| a.percentage.to_f } %> <% badge_class = (sum_pct - 100.0).abs <= 0.01 ? "bg-success" : "bg-danger" %> - - <% end %> diff --git a/app/views/targets/new.html.erb b/app/views/targets/new.html.erb index 42cb7bd..e69de29 100644 --- a/app/views/targets/new.html.erb +++ b/app/views/targets/new.html.erb @@ -1,85 +0,0 @@ -<% content_for :title, "Ajouter une Cible" %> - -

Ajouter une Cible

- -<%= form_with(model: @target) do |f| %> -
-
- <%= f.text_field :name, class: "form-control", placeholder: "Nom de la cible" %> -
- -
-
-
NomRépartition
Total %Créé leActionsRépartitionDate de Création
- <%= link_to t.name.presence || "Objectif ##{t.id}", t %> + <%= link_to target.name.presence || "Cible ##{t.id}", target %> - <% if t.target_allocations.empty? %> + <% if target.allocations.empty? %> Aucune répartition définie <% else %> -
    - <% t.target_allocations.each do |a| %> +
      + <% target.allocations.each do |a| %>
    • <%= a.nutrient_profile&.name || "Profil ##{a.nutrient_profile_id}" %> — <%= number_with_precision(a.percentage.to_f, precision: 2) %>% @@ -38,20 +36,8 @@
    <% end %>
- - <%= number_with_precision(sum_pct, precision: 2) %>% - - - <%= l(t.created_at, format: :short) %> - - <%= link_to "Voir", t, class: "btn btn-outline-secondary btn-sm" %> - <%= link_to "Modifier", edit_target_path(t), class: "btn btn-outline-primary btn-sm" %> - <%# FIXME: Doesn't work. %> - <%= link_to "Supprimer", t, class: "btn btn-outline-danger btn-sm", - data: { turbo_method: :delete, turbo_confirm: "Supprimer cet objectif ?" } %> + <%= l(target.created_at, format: :short) %>
- - - - - - - - <%= f.fields_for :target_allocations do |af| %> - <% np = af.object.nutrient_profile %> - - - - - <% end %> - - - - - - - -
ProfilProportion
- <%= af.hidden_field :nutrient_profile_id %> - <%= np&.name.capitalize || "Profil ##{af.object.nutrient_profile_id}" %> - -
- <%= af.number_field :percentage, - in: 0..100, step: 0.5, - class: "form-control text-end alloc-input", - placeholder: "0.0", - data: { action: "input->alloc#sum" } %> - % -
-
Ajustez chaque pourcentage pour totaliser 100%. - Total : 0% -
-
- - -
-
- <%= f.submit "Enregistrer l’objectif", class: "btn btn-primary", id: "submit-btn" %> - <%= link_to "Annuler", targets_path, class: "btn btn-secondary" %> -
-
- -<% end %> - - -- cgit v1.2.3