Show calculator

app/controllers/account/calculators_controller.rb

@@ -59,7 +59,7 @@
   end
 
   def calculator
-    @calculator = Calculator.friendly.find(params[:slug])
+    @calculator = Calculator.find(params[:slug])
   end
 
   def collect_fields_for_form
@@ -77,11 +77,10 @@
 
   def calculator_params
     params.require(:calculator).permit(
-      :name, :id, :slug, :preferable,
-      fields_attributes: [
-        :id, :selector, :label, :name, :value, :unit, :from, :to, :type, :kind,
-        :_destroy
-      ]
+      :id, :en_name, :uk_name,
+      formulas_attributes: [:id, :expression, :en_label, :uk_label, :calculator_id, :_destroy],
+      fields_attributes: [:id, :en_label, :uk_label, :var_name, :field_type, :_destroy,
+        categories_attributes: [:id, :en_name, :price, :_destroy]]
     )
   end
 

app/controllers/calculators_controller.rb

@@ -14,6 +14,7 @@
 
   def show
     @calculator = resource
+    @result     = params[:result]
   end
 
   def calculate
@@ -45,6 +46,6 @@
   end
 
   def resource
-    collection.friendly.find(params[:slug])
+    collection.find(params[:slug])
   end
 end

app/models/field.rb

@@ -26,6 +26,7 @@
 #
 class Field < ApplicationRecord
   belongs_to :calculator
+
   has_many :categories, dependent: :destroy
   accepts_nested_attributes_for :categories, reject_if: :all_blank, allow_destroy: true
 end

app/views/account/calculators/index.html.erb

@@ -29,9 +29,9 @@
     </thead>
     <tbody class="admin-table-links">
       <% @calculators.each do |calculator| %>
-        <tr class="<%= calculator.preferable? ? "table-success" : "text-inherit" %>">
+        <tr >
           <td><%= calculator.id %></td>
-          <td><%= calculator.name %></td>
+          <td><%= calculator.en_name %></td>
           <td><%= calculator.slug %></td>
           <td class="text-center"><%= link_to icon('fa-solid', 'eye'), account_calculator_path(slug: calculator) %></td>
           <td class="text-center"><%= link_to icon('fa-solid', 'edit'), edit_account_calculator_path(slug: calculator) %></td>

app/views/account/calculators/partials/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for(@calculator) do |f| %>
+<%= simple_form_for(@calculator, url: account_calculators_path) do |f| %>
   <div class="form-group row">
     <div class="my-auto col-12 has-float-label">
       <%= f.input :en_name, label: "Calculator Name:", class: 'form-control' %>
@@ -35,4 +35,4 @@
       <span><%= t('buttons.cancel') %></span>
     <% end %>
   </div>
-<% end %>
+<% end %>

app/views/calculators/show.html.erb

@@ -0,0 +1,23 @@
+<div class="container place-items-center">
+  <h1 class="text-4xl font-bold">Calculator <%= @calculator.en_name %></h1><br>
+
+  <%= form_with url: calculate_account_calculator_path(slug: @calculator.slug || @calculator.id) do |form| %>
+    <% @calculator.fields.each do |field| %>
+      <div class="space-y-4 form-inputs">
+        <h1><%= form.label field.var_name, field.en_label %></h1>
+        <% if field.field_type == 'number' %>
+          <%= form.number_field "inputs[#{field.var_name}]", placeholder: field.en_label %>
+        <% else %>
+          <%= form.select "inputs[#{field.var_name}]", options_from_collection_for_select(field.categories, :price, :en_name) %>
+        <% end %>
+      </div><br>
+    <% end %>
+    <div class="mt-6 form-actions">
+      <%= form.submit "Calculate", class: "bg-blue-500 text-white font-semibold px-4 py-2 rounded hover:bg-blue-700" %>
+    </div>
+  <% end %>
+
+  <% if @result.present? %>
+    <p>Result: <%= @result %></p>
+  <% end %>
+</div>

config/routes.rb

@@ -56,14 +56,17 @@
       end
 
       resources :diapers_periods
-
+      resources :calculators, param: :slug do
+        member do
+          post :calculate
+        end
+      end
       namespace :diapers_periods do
         resources :categories, only: [:destroy] do
           get :with_periods, on: :collection
           get :available, on: :collection
         end
       end
-
       scope module: :calculators do
         resources :calculators, only: [], param: :slug do
           resources :fields, only: :new

db/migrate/20241107101158_update_calculators.rb

@@ -0,0 +1,20 @@
+class UpdateCalculators < ActiveRecord::Migration[7.2]
+  def up
+    change_table :calculators, bulk: true do |t|
+      t.remove :uuid, :name, :preferable
+      t.string :uk_name, null: false, default: ""
+      t.string :en_name, null: false, default: ""
+    end
+  end
+
+  def down
+    change_table :calculators, bulk: true do |t|
+      t.string :uuid
+      t.string :name
+      t.boolean :preferable, null: false, default: false
+
+      t.remove :uk_name
+      t.remove :en_name
+    end
+  end
+end

db/migrate/20241107134610_create_formulas.rb

@@ -1,9 +1,9 @@
 class CreateFormulas < ActiveRecord::Migration[7.2]
   def change
     create_table :formulas do |t|
-      t.string :expression, null: false
-      t.string :uk_label, null: false
-      t.string :en_label, null: false
+      t.string :expression, null: false, default: ""
+      t.string :uk_label, null: false, default: ""
+      t.string :en_label, null: false, default: ""
       t.string :uk_unit
       t.string :en_unit
       t.references :calculator, null: false, foreign_key: true

db/migrate/20241107135318_change_fields.rb

@@ -1,10 +1,49 @@
 class ChangeFields < ActiveRecord::Migration[7.2]
-  def change
-    remove_columns :fields, :uuid, :selector, :type, :label, :name, :value, :from, :to, :kind, :unit
+  def up
+    change_table :fields, bulk: true do |t|
+      t.remove :uuid, type: :string
+      t.remove :selector, type: :string
+      t.remove :type, type: :string
+      t.remove :label, type: :string
+      t.remove :name, type: :string
+      t.remove :value, type: :string
+      t.remove :from, type: :integer
+      t.remove :to, type: :integer
+      t.remove :kind, type: :string
+      t.remove :unit, type: :string
+      t.remove :calculator_id, type: :integer
 
-    add_column :fields, :uk_label, :string, null: false
-    add_column :fields, :en_label, :string, null: false
-    add_column :fields, :var_name, :string, null: false
-    add_column :fields, :field_type, :string, null: false
+      t.string :uk_name, null: false, default: ""
+      t.string :en_name, null: false, default: ""
+      t.string :var_name, null: false, default: ""
+      t.string :field_type, null: false, default: ""
+
+      t.references :calculator, foreign_key: true, null: false, default: 0
+    end
+
+    change_column_default :fields, :calculator_id, from: 0, to: nil
+  end
+
+  def down
+    change_table :fields, bulk: true do |t|
+      t.string :uuid
+      t.string :selector
+      t.string :type
+      t.string :label
+      t.string :name
+      t.string :value
+      t.integer :from
+      t.integer :to
+      t.string :kind
+      t.string :unit
+      t.integer :calculator_id
+
+      t.remove :uk_name
+      t.remove :en_name
+      t.remove :var_name
+      t.remove :field_type
+
+      t.remove_references :calculator, foreign_key: true
+    end
   end
 end

db/migrate/20241107140542_change_categories.rb

@@ -1,8 +1,23 @@
 class ChangeCategories < ActiveRecord::Migration[7.2]
-  def change
-    remove_columns :categories, :priority, :preferable
-    add_column :categories, :price, :float, null: false
+  def up
+    change_table :categories, bulk: true do |t|
+      t.remove :preferable, type: :boolean
 
-    add_reference :categories, :field, null: false, foreign_key: true
+      t.float :price, null: false, default: 0.0
+
+      t.references :field, null: false, foreign_key: true, default: 0
+
+      t.boolean :preferable, null: false, default: false
+    end
+
+    change_column_default :categories, :field_id, nil
+  end
+
+  def down
+    change_table :categories, bulk: true do |t|
+      t.remove :preferable, type: :boolean
+
+      t.remove :pricet.remove_references :field, foreign_key: true
+    end
   end
 end

db/schema.rb

@@ -47,8 +47,8 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "slug"
-    t.string "uk_name", null: false
-    t.string "en_name", null: false
+    t.string "uk_name", default: "", null: false
+    t.string "en_name", default: "", null: false
     t.index ["slug"], name: "index_calculators_on_slug", unique: true
   end
 
@@ -98,10 +98,10 @@
     t.bigint "calculator_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.string "uk_label", null: false
-    t.string "en_label", null: false
-    t.string "var_name", null: false
-    t.string "field_type", null: false
+    t.string "uk_label", default: "", null: false
+    t.string "en_label", default: "", null: false
+    t.string "var_name", default: "", null: false
+    t.string "field_type", default: "", null: false
     t.index ["calculator_id"], name: "index_fields_on_calculator_id"
   end
 
@@ -124,8 +124,8 @@
   end
 
   create_table "formulas", force: :cascade do |t|
-    t.string "expression", null: false
-    t.string "uk_label", null: false
+    t.string "expression", default: "", null: false
+    t.string "uk_label", default: "", null: false
     t.string "en_label", null: false
     t.string "uk_unit"
     t.string "en_unit"
@@ -204,9 +204,9 @@
     t.string "last_sign_in_ip"
     t.string "provider"
     t.string "uid"
-    t.boolean "blocked", default: false
+    t.boolean "blocked", default: false, null: false
     t.integer "role", default: 0
-    t.boolean "receive_recomendations", default: false
+    t.boolean "receive_recomendations", default: false, null: false
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end