- <% results.each do |result| %>
-
-
- <%= result[:label] %>
-
- =
-
- <%= result[:result] %>
-
-
- <% end %>
+<%# TODO: Delete this and use user provided value%>
+<% formula_image = "money_to_spent_2.png" %>
+
+
+
Calculation Results
+
+ <% results.each do |result| %>
+
+ <%= image_tag "#{formula_image}", class: "img-margin", alt: "icon" %>
+
+ <%= result[:result] %>
+
+
+ <%= result[:unit] %>
+
+
+ <%= result[:label] %>
+
+
+ <% end %>
+
diff --git a/app/views/calculators/partials/show/_constructor_calculator_description.erb b/app/views/calculators/partials/show/_constructor_calculator_description.erb
new file mode 100644
index 000000000..fed35215a
--- /dev/null
+++ b/app/views/calculators/partials/show/_constructor_calculator_description.erb
@@ -0,0 +1,8 @@
+<%# TODO: Delete this if %>
+<% if false %>
+
+
+ <%# TODO: ADD text here %>
+
+
+<% end %>
diff --git a/app/views/calculators/show.html.erb b/app/views/calculators/show.html.erb
index 489f4f024..82295fe22 100644
--- a/app/views/calculators/show.html.erb
+++ b/app/views/calculators/show.html.erb
@@ -1,21 +1,40 @@
-
-
Calculator <%= @calculator.name %>
+<%# TODO: Delete this and use user provided value %>
+<% color = "#088F8F" %>
- <%= form_with url: calculate_calculator_path(@calculator) do |form| %>
- <% @calculator.fields.each do |field| %>
-
-
<%= form.label field.var_name, field.label %>
- <% if field.kind == 'number' %>
- <%= form.number_field "inputs[#{field.var_name}]", placeholder: field.label %>
- <% else %>
- <%= form.select "inputs[#{field.var_name}]", options_from_collection_for_select(field.categories, :price, :name) %>
- <% end %>
-
+<%# TODO: Delete this and use user provided value %>
+<% calculator_image = "scales.png" %>
+
+
+
+
Calculator <%= @calculator.name %> <%= @text %>
+
+
+ <%= form_with html: { class: "simple_form_calculator"}, url: calculate_calculator_path(@calculator) do |form| %>
+
+ <% @calculator.fields.each do |field| %>
+
<%= form.label field.var_name, field.label %>
+ <% if field.kind == 'number' %>
+
+ <%= form.number_field "inputs[#{field.var_name}]",
+ placeholder: field.label,
+ class: "required rounded w-100 calculator-field"
+ %>
+
+ <% else %>
+ <%= form.select "inputs[#{field.var_name}]",
+ options_from_collection_for_select(field.categories, :price, :name),
+ {},
+ class: "flex-row rounded flex-item w-100 form_fild calculator-field" %>
+ <% end %>
+ <% end %>
+ <%= form.submit "Calculate", class: "btn-nonito result-btn dynamic-background-color" %>
+
<% end %>
-
- <%= form.submit "Calculate", class: "bg-blue-500 text-white font-semibold px-4 py-2 rounded hover:bg-blue-700" %>
+ <%= image_tag calculator_image, class: "scales_img", alt: t(".image_alt") %>
- <% end %>
+
<%= turbo_frame_tag "calc-results" %>
+
+<%= render "calculators/partials/show/constructor_calculator_description" %>
diff --git a/config/locales/en/en.yml b/config/locales/en/en.yml
index 0c4a7bca0..728b2aea0 100644
--- a/config/locales/en/en.yml
+++ b/config/locales/en/en.yml
@@ -83,6 +83,7 @@ en:
month_error_msg: "Please, select month"
show:
welcome_header: "Welcome to ZeroWaste"
+ image_alt: "Scales"
buttons:
to_main: "To main"
calculate: "Calculate"
diff --git a/config/locales/uk/uk.yml b/config/locales/uk/uk.yml
index 05a4d3bf8..cbbc7c58d 100644
--- a/config/locales/uk/uk.yml
+++ b/config/locales/uk/uk.yml
@@ -65,6 +65,7 @@ uk:
will_buy_diapers: "Кількість підгузків, які ще будуть використані до моменту, коли дитина перейде на звичайну білизну"
money_spent: "Вартість використаних підгузків"
money_will_be_spent: "Вартість підгузків, які ще будуть використані до моменту, коли дитина перейде на звичайну білизну"
+ image_alt: "Ваги"
buttons:
to_main: "На головну"
calculate: "Розрахувати"
diff --git a/spec/helpers/calculators/calculation_service_helper_spec.rb b/spec/helpers/calculators/calculation_service_helper_spec.rb
new file mode 100644
index 000000000..1e81b43a8
--- /dev/null
+++ b/spec/helpers/calculators/calculation_service_helper_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Calculators::CalculationService, type: :helper do
+ let(:calculator) { instance_double("Calculator", formulas: formulas) }
+ let(:formulas) do
+ [
+ Formula.new(en_label: "Addition", en_unit: "units", uk_label: "Додавання", uk_unit: "одиниці", expression: "x + y"),
+ Formula.new(en_label: "Multiplication", en_unit: "units", uk_label: "Множення", uk_unit: "одиниці", expression: "x * y")
+ ]
+ end
+ let(:inputs) { ActionController::Parameters.new({ x: 5, y: 3 }) }
+
+ before do
+ allow_any_instance_of(ApplicationHelper).to receive(:current_locale?).with(:en).and_return(locale_en)
+ end
+
+ describe "#perform" do
+ subject do
+ I18n.with_locale(locale_en ? :en : :uk) do
+ described_class.new(calculator, inputs).perform
+ end
+ end
+
+ context "when locale is English" do
+ let(:locale_en) { true }
+
+ it "returns results with English labels and units" do
+ expect(subject).to eq([
+ { label: "Addition", result: 8, unit: "units" },
+ { label: "Multiplication", result: 15, unit: "units" }
+ ])
+ end
+ end
+
+ context "when locale is Ukrainian" do
+ let(:locale_en) { false }
+
+ it "returns results with Ukrainian labels and units" do
+ expect(subject).to eq([
+ { label: "Додавання", result: 8, unit: "одиниці" },
+ { label: "Множення", result: 15, unit: "одиниці" }
+ ])
+ end
+ end
+ end
+end