ahinz
/
grantcallendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

This commit is contained in:
Adrian Hinz 2022-06-14 09:04:20 +02:00
parent 4e711f73f4
commit 9f2989c3bc
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/dotation.rb
View File

@ -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

43
app/views/grants/_form.html.erb
View File

@ -36,6 +36,15 @@
</div>
</div>
<div class="row">
<div class="col-md-4">
<%= form.label :announcement_date %>
<div class="input-group date" id="announcement_date_date" data-target-input="nearest">
<%= form.text_field :announcement_date, class: 'form-control datetimepicker-input', 'data-target': '#announcement_date_date', placeholder: 'Wprowadź datę' %>
<div class="input-group-append" data-target="#announcement_date_date" data-toggle="datetimepicker">
<div class="input-group-text"><i class="fa fa-calendar"></i></div>
</div>
</div>
</div>
<div class="col-md-4">
<%= form.label :start_date %>
<div class="input-group date" id="start_date_date" data-target-input="nearest">
@ -54,17 +63,15 @@
</div>
</div>
</div>
<div class="col-md-4">
<%= form.label :announcement_date %>
<div class="input-group date" id="announcement_date_date" data-target-input="nearest">
<%= form.text_field :announcement_date, class: 'form-control datetimepicker-input', 'data-target': '#announcement_date_date', placeholder: 'Wprowadź datę' %>
<div class="input-group-append" data-target="#announcement_date_date" data-toggle="datetimepicker">
<div class="input-group-text"><i class="fa fa-calendar"></i></div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="form-check">
<%= form.check_box(:ann_date_quarter, { class: 'form-check-input' }) %>
<%= form.label :ann_date_quarter %>
</div>
</div>
<div class="col-md-4">
<div class="form-check">
<%= form.check_box(:start_date_quarter, { class: 'form-check-input' }) %>
@ -77,16 +84,15 @@
<%= form.label :end_date_quarter %>
</div>
</div>
<div class="col-md-4">
<div class="form-check">
<%= form.check_box(:ann_date_quarter, { class: 'form-check-input' }) %>
<%= form.label :ann_date_quarter %>
</div>
</div>
<div class="form-group">
<div class="row">
<div class="col-md-4">
<div class="form-group">
<%= form.label :localization %>
<%= form.text_field :localization, class: 'form-control', placeholder: 'Wprowadź region' %>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
@ -158,7 +164,14 @@
</div>
<div class="form-group">
<%= form.label :max_percent %>
<div class="row">
<div class="col-md-2 input-group mb-3">
<%= form.text_field :max_percent, class: 'form-control', placeholder: 'Maksymalny poziom dofinansowania' %>
<div class="input-group-append">
<span class="input-group-text"><i class="fas fa-percent"></i></span>
</div>
</div>
</div>
</div>
<div class="form-group">
<%= form.label :company_sizes %>