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

added view on front for dot ammount

This commit is contained in:
Adrian Hinz 2022-04-05 17:12:39 +02:00
parent b3c1a1f5d5
commit d8994de79f
3 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/dotation.rb
View File

@ -26,6 +26,12 @@ class Dotation < ApplicationRecord
class_name: 'Currency' class_name: 'Currency'
belongs_to :max_amount_curr, foreign_key: :max_amount_curr_id, belongs_to :max_amount_curr, foreign_key: :max_amount_curr_id,
class_name: 'Currency' class_name: 'Currency'
# dotation currency
belongs_to :min_dot_amount_curr, foreign_key: :min_dot_amount_curr_id,
class_name: 'Currency'
belongs_to :max_dot_amount_curr, foreign_key: :max_dot_amount_curr_id,
class_name: 'Currency'
has_and_belongs_to_many :expenses has_and_belongs_to_many :expenses
has_and_belongs_to_many :company_sizes has_and_belongs_to_many :company_sizes
has_and_belongs_to_many :projects has_and_belongs_to_many :projects

22
app/views/home/_show.html.erb
View File

@ -80,24 +80,46 @@
</ul> </ul>
</td> </td>
</tr> </tr>
<% unless @dotation.localization.blank? %>
<tr> <tr>
<td> <td>
<b>Miejsce realizacji projektu</b> <b>Miejsce realizacji projektu</b>
</td> </td>
<td><%= @dotation.localization %></td> <td><%= @dotation.localization %></td>
</tr> </tr>
<% end %>
<% unless @dotation.min_amount.blank? %>
<tr> <tr>
<td> <td>
<b>Minimalna wartość projektu (wydatków)</b> <b>Minimalna wartość projektu (wydatków)</b>
</td> </td>
<td><%= change_ammount(@dotation.min_amount) %> <%= @dotation.min_amount_curr.name %></td> <td><%= change_ammount(@dotation.min_amount) %> <%= @dotation.min_amount_curr.name %></td>
</tr> </tr>
<% end %>
<% unless @dotation.max_amount.blank? %>
<tr> <tr>
<td> <td>
<b>Maksymalna wartość projektu (wydatków)</b> <b>Maksymalna wartość projektu (wydatków)</b>
</td> </td>
<td><%= change_ammount(@dotation.max_amount) %> <%= @dotation.max_amount_curr.name %></td> <td><%= change_ammount(@dotation.max_amount) %> <%= @dotation.max_amount_curr.name %></td>
</tr> </tr>
<% end %>
<% unless @dotation.min_dot_ammount.blank? %>
<tr>
<td>
<b>Minimalna wartość dotacji</b>
</td>
<td><%= change_ammount(@dotation.min_dot_ammount) %> <%= @dotation.min_dot_amount_curr.name %></td>
</tr>
<% end %>
<% unless @dotation.max_dot_ammount.blank? %>
<tr>
<td>
<b>Maksymalna wartość dotacji</b>
</td>
<td><%= change_ammount(@dotation.max_dot_ammount) %> <%= @dotation.max_dot_amount_curr.name %></td>
</tr>
<% end %>
</tbody> </tbody>
</table> </table>
</div> </div>

28
app/views/home/_show.pdf.erb
View File

@ -77,24 +77,46 @@
</ul> </ul>
</td> </td>
</tr> </tr>
<% unless @dotation.localization.blank? %>
<tr> <tr>
<td> <td>
<b>Miejsce realizacji projektu</b> <b>Miejsce realizacji projektu</b>
</td> </td>
<td><%= dotation.localization %></td> <td><%= @dotation.localization %></td>
</tr> </tr>
<% end %>
<% unless @dotation.min_amount.blank? %>
<tr> <tr>
<td> <td>
<b>Minimalna wartość projektu (wydatków)</b> <b>Minimalna wartość projektu (wydatków)</b>
</td> </td>
<td><%= change_ammount(dotation.min_amount) %> <%= dotation.min_amount_curr.name %></td> <td><%= change_ammount(@dotation.min_amount) %> <%= @dotation.min_amount_curr.name %></td>
</tr> </tr>
<% end %>
<% unless @dotation.max_amount.blank? %>
<tr> <tr>
<td> <td>
<b>Maksymalna wartość projektu (wydatków)</b> <b>Maksymalna wartość projektu (wydatków)</b>
</td> </td>
<td><%= change_ammount(dotation.max_amount) %> <%= dotation.max_amount_curr.name %></td> <td><%= change_ammount(@dotation.max_amount) %> <%= @dotation.max_amount_curr.name %></td>
</tr> </tr>
<% end %>
<% unless @dotation.min_dot_ammount.blank? %>
<tr>
<td>
<b>Minimalna wartość dotacji</b>
</td>
<td><%= change_ammount(@dotation.min_dot_ammount) %> <%= @dotation.min_dot_amount_curr.name %></td>
</tr>
<% end %>
<% unless @dotation.max_dot_ammount.blank? %>
<tr>
<td>
<b>Maksymalna wartość dotacji</b>
</td>
<td><%= change_ammount(@dotation.max_dot_ammount) %> <%= @dotation.max_dot_amount_curr.name %></td>
</tr>
<% end %>
</tbody> </tbody>
</table> </table>
</div> </div>