diff --git a/app/models/dotation.rb b/app/models/dotation.rb index 3f2adbb..24052d0 100644 --- a/app/models/dotation.rb +++ b/app/models/dotation.rb @@ -106,7 +106,7 @@ class Dotation < ApplicationRecord when 7, 8, 9 then 'III ' when 10, 11, 12 then 'IV ' end - ret += "kwartał #{date.year}" + ret += "kwartału #{date.year}" ret end diff --git a/app/views/grants/_form.html.erb b/app/views/grants/_form.html.erb index 957d8ca..18791ef 100644 --- a/app/views/grants/_form.html.erb +++ b/app/views/grants/_form.html.erb @@ -36,6 +36,15 @@
+
+ <%= form.label :announcement_date %> +
+ <%= form.text_field :announcement_date, class: 'form-control datetimepicker-input', 'data-target': '#announcement_date_date', placeholder: 'Wprowadź datę' %> +
+
+
+
+
<%= form.label :start_date %>
@@ -54,17 +63,15 @@
-
- <%= form.label :announcement_date %> -
- <%= form.text_field :announcement_date, class: 'form-control datetimepicker-input', 'data-target': '#announcement_date_date', placeholder: 'Wprowadź datę' %> -
-
-
-
-
+
+
+
+ <%= form.check_box(:ann_date_quarter, { class: 'form-check-input' }) %> + <%= form.label :ann_date_quarter %> +
+
<%= form.check_box(:start_date_quarter, { class: 'form-check-input' }) %> @@ -77,16 +84,15 @@ <%= form.label :end_date_quarter %>
-
-
- <%= form.check_box(:ann_date_quarter, { class: 'form-check-input' }) %> - <%= form.label :ann_date_quarter %> -
+
-
+
+
+
<%= form.label :localization %> <%= form.text_field :localization, class: 'form-control', placeholder: 'Wprowadź region' %>
+
@@ -158,7 +164,14 @@
<%= form.label :max_percent %> +
+
<%= form.text_field :max_percent, class: 'form-control', placeholder: 'Maksymalny poziom dofinansowania' %> +
+ +
+
+
<%= form.label :company_sizes %>