fixes and addon

app/controllers/dotations_controller.rb

@@ -105,7 +105,9 @@ class DotationsController < ApplicationController
                   :max_amount, :max_percent, :localization, :company_size_id,
                   :partner_id, :expert_id, :expert_info, :start_date, :end_date,
                   :announcement_date, :full_descr, :positioning_text, :points,
-                  :date_of_recruitment, :min_amount_curr_id, :max_amount_curr_id,
+                  :date_of_recruitment, :min_amount_curr_id,
+                  :max_amount_curr_id, :min_dot_ammount, :max_dot_ammount,
+                  :min_dot_amount_curr_id, :max_dot_amount_curr_id,
                   project_ids: [], tag_ids: [], company_activity_ids: [],
                   company_size_ids: [], expense_ids: [])
   end

app/views/dotations/_form.html.erb

@@ -102,6 +102,40 @@
     </div>
   </div>
 </div>
+<div class="row">
+  <div class="col-md-6">
+    <div class="row">
+      <div class="col-md-9">
+        <div class="form-group">
+          <%= form.label :min_dot_ammount %>
+          <%= form.text_field :min_dot_ammount, class: 'form-control', placeholder: 'Minimalna wartość dotacji' %>
+        </div>
+      </div>
+      <div class="col-md-3">
+        <div class="form-group">
+          <%= form.label :min_dot_amount_curr_id %>
+          <%= form.select(:min_dot_amount_curr_id, @currencies.collect {|p| [ p.name, p.id ] }, { include_blank: false }, class: 'form-control select2' ) %>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="col-md-6">
+    <div class="row">
+      <div class="col-md-9">
+        <div class="form-group">
+          <%= form.label :max_dot_ammount %>
+          <%= form.text_field :max_dot_ammount, class: 'form-control', placeholder: 'Maksymalna wartość dotacji' %>
+        </div>
+      </div>
+      <div class="col-md-3">
+        <div class="form-group">
+          <%= form.label :max_dot_amount_curr_id %>
+          <%= form.select(:max_dot_amount_curr_id, @currencies.collect {|p| [ p.name, p.id ] }, { include_blank: false, }, class: 'form-control select2' ) %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 <div class="form-group">
   <%= form.label :max_percent %>
   <%= form.text_field :max_percent, class: 'form-control', placeholder: 'Maksymalny poziom dofinansowania' %>

config/locales/pl/models/dotation.yml

@@ -7,13 +7,17 @@ pl:
         name: "Opisowa nazwa dotacji"
         formal_name: "Nazwa formalna"
         points: Punktacja
-        date_from: Data od
+        date_from: Data początku obowiązywania dotacji
-        date_to: Data do
+        date_to: Data końca ważności dotacji
         localization: Lokalizacja
         min_amount: Minimalna wartość projektu
         max_amount: Maksymalna wartość projektu
         min_amount_curr_id: Waluta
         max_amount_curr_id: Waluta
+        min_dot_ammount: Minimalna wartość dotacji
+        max_dot_ammount: Maksymalna wartość dotacji
+        min_dot_amount_curr_id: Waluta
+        max_dot_amount_curr_id: Waluta
         max_percent: Maksymalny poziom dofinansowania
         company_activities: Dominująca działalność firmy
         company_sizes: Wielkość firmy

db/migrate/20220215114605_create_experts.rb

@@ -2,7 +2,7 @@ class CreateExperts < ActiveRecord::Migration[5.2]
   def change
     create_table :experts do |t|
       t.string :name
-      t.string :description
+      t.text :description
       t.integer :created_by
       t.integer :updated_by
 

db/migrate/20220328092314_add_min_max_dot_ammounts_to_dotations.rb

@@ -0,0 +1,8 @@
+class AddMinMaxDotAmmountsToDotations < ActiveRecord::Migration[5.2]
+  def change
+    add_column :dotations, :min_dot_ammount, :bigint
+    add_column :dotations, :min_dot_amount_curr_id, :integer, default: 1
+    add_column :dotations, :max_dot_ammount, :bigint
+    add_column :dotations, :max_dot_amount_curr_id, :integer, default: 1
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_03_22_143440) do
+ActiveRecord::Schema.define(version: 2022_03_28_092314) do
 
   create_table "active_storage_attachments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "name", null: false
@@ -99,6 +99,10 @@ ActiveRecord::Schema.define(version: 2022_03_22_143440) do
     t.integer "updated_by"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.bigint "min_dot_ammount"
+    t.integer "min_dot_amount_curr_id", default: 1
+    t.bigint "max_dot_ammount"
+    t.integer "max_dot_amount_curr_id", default: 1
     t.index ["active"], name: "index_dotations_on_active"
     t.index ["announcement_date"], name: "index_dotations_on_announcement_date"
     t.index ["arch"], name: "index_dotations_on_arch"
@@ -141,7 +145,7 @@ ActiveRecord::Schema.define(version: 2022_03_22_143440) do
 
   create_table "experts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "name"
-    t.string "description"
+    t.text "description"
     t.integer "created_by"
     t.integer "updated_by"
     t.datetime "created_at", null: false