cleanup (due to new CRUD for budget groups and headings)

This commit is contained in:
Julian Herrero
2018-12-13 10:03:30 +01:00
parent 25e1afea48
commit 8fb8f70efd
13 changed files with 0 additions and 208 deletions

View File

@@ -89,10 +89,6 @@ module AdminHelper
user_roles(user).join(", ")
end
def display_budget_goup_form(group)
group.errors.messages.size > 0 ? "" : "display:none"
end
private
def namespace

View File

@@ -1,2 +0,0 @@
$("#<%= dom_id(@budget) %>_groups").html('<%= j render("admin/budgets/groups", groups: @groups) %>');
App.Forms.toggleLink();

View File

@@ -1,7 +0,0 @@
<% if @group.errors.any? %>
$("#group-form-<%= @group.id %>").html('<%= j render("admin/budgets/group_form", group: @group, budget: @group.budget, button_title: t("admin.budgets.form.submit"), id: "group-form-#{@group.id}", css_class: "group-toggle-#{@group.id}" ) %>');
<% else %>
$("#group-name-<%= @group.id %>").html('<%= @group.name %>')
$("#max-heading-label-<%=@group.id%>").html('<%= j render("admin/budgets/max_headings_label", current: @group.max_votable_headings, max: @group.headings.count, group: @group) %>')
$(".group-toggle-<%= @group.id %>").toggle()
<% end %>

View File

@@ -1,7 +0,0 @@
<div id='error_explanation' class='callout alert'>
<ul>
<% errors.each do |error| %>
<li><%= error %></li>
<% end %>
</ul>
</div>

View File

@@ -1,2 +0,0 @@
$("#<%= dom_id(@budget_group) %>").html('<%= j render("admin/budgets/group", group: @budget_group, headings: @headings) %>');
App.Forms.toggleLink();

View File

@@ -1 +0,0 @@
$("#heading-<%=@heading.id%>").html("<td colspan='4'><%= j render("admin/budgets/heading_form", group: @budget_group, budget: @budget, heading: @heading) %></td>");

View File

@@ -1 +0,0 @@
$("#<%= dom_id(@budget_group) %>").html('<%= j render("admin/budgets/group", group: @budget_group, headings: @budget_group.headings) %>');

View File

@@ -1,48 +0,0 @@
<table>
<thead>
<tr>
<th colspan="5" class="with-button">
<%= content_tag(:span, group.name, class:"group-toggle-#{group.id}", id:"group-name-#{group.id}") %>
<%= content_tag(:span, (render 'admin/budgets/max_headings_label', current: group.max_votable_headings, max: group.headings.count, group: group if group.max_votable_headings), class:"small group-toggle-#{group.id}", id:"max-heading-label-#{group.id}") %>
<%= render 'admin/budgets/group_form', budget: @budget, group: group, id: "group-form-#{group.id}", button_title: t("admin.budgets.form.submit"), css_class: "group-toggle-#{group.id}" %>
<%= link_to t("admin.budgets.form.edit_group"), "#", class: "button float-right js-toggle-link hollow", data: { "toggle-selector" => ".group-toggle-#{group.id}" } %>
<%= link_to t("admin.budgets.form.add_heading"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#group-#{group.id}-new-heading-form" } %>
</th>
</tr>
<% if headings.present? %>
<tr>
<th><%= t("admin.budgets.form.table_heading") %></th>
<th class="text-right"><%= t("admin.budgets.form.table_amount") %></th>
<th class="text-right"><%= t("admin.budgets.form.table_population") %></th>
<th class="text-right"><%= t("admin.budgets.form.table_allow_custom_contents") %></th>
<th><%= t("admin.actions.actions") %></th>
</tr>
<% end %>
</thead>
<tbody>
<% if headings.blank? %>
<tr>
<td colspan="5">
<div class="callout primary">
<%= t("admin.budgets.form.no_heading") %>
</div>
</td>
</tr>
<% end %>
<tr id="group-<%= group.id %>-new-heading-form" style="display:none">
<td colspan="5">
<%= render "admin/budgets/heading_form", group: group, budget: @budget, heading: Budget::Heading.new %>
</td>
</tr>
<% headings.each do |heading| %>
<%= render "admin/budgets/heading", group: group, budget: @budget, heading: heading %>
<% end %>
</tbody>
</table>

View File

@@ -1,28 +0,0 @@
<%= form_for [:admin, budget, group], html: {id: id, style: display_budget_goup_form(group), class: css_class}, remote: true do |f| %>
<%= f.label :name, t("admin.budgets.form.group") %>
<div class="input-group">
<%= f.text_field :name,
label: false,
maxlength: 50,
placeholder: t("admin.budgets.form.group"),
class: "input-group-field" %>
<% if group.persisted? %>
<div class="small-12 medium-6 large-4">
<%= f.label :name, t("admin.budgets.form.max_votable_headings") %>
<%= f.select :max_votable_headings,
(1..group.headings.count),
label: false,
placeholder: t("admin.budgets.form.max_votable_headings"),
class: "input-group-field" %>
</div>
<% end %>
<div class="input-group-button">
<%= f.submit button_title, class: "button success" %>
</div>
</div>
<% end %>

View File

@@ -1,21 +0,0 @@
<h3 class="inline-block"><%= t('admin.budgets.show.groups', count: groups.count) %></h3>
<%= link_to t("admin.budgets.form.add_group"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#new-group-form" } %>
<% if groups.blank? %>
<div class="callout primary clear">
<%= t("admin.budgets.form.no_groups") %>
</div>
<% end %>
<%= render 'admin/budgets/group_form',
budget: @budget,
group: Budget::Group.new,
id: "new-group-form",
button_title: t("admin.budgets.form.create_group"),
css_class: '' %>
<% groups.each do |group| %>
<div id="<%= dom_id(group) %>">
<%= render "admin/budgets/group", group: group, headings: group.headings.order(:id) %>
</div>
<% end %>

View File

@@ -1,27 +0,0 @@
<tr id="heading-<%=heading.id%>">
<td>
<%= heading.name %>
</td>
<td class="text-right">
<%= heading.budget.formatted_heading_price(heading) %>
</td>
<td class="text-right">
<%= heading.population %>
</td>
<td class="text-right">
<%= heading.allow_custom_content ? t("true_value") : t("false_value") %>
</td>
<td>
<%= link_to t("admin.actions.edit"),
edit_admin_budget_budget_group_budget_heading_path(budget_id: group.budget.id, budget_group_id: group.id, id: heading.id),
class: "button hollow",
remote: true %>
<% if heading.can_be_deleted? %>
<%= link_to t('admin.administrators.administrator.delete'),
#admin_budget_budget_group_budget_headings_path(group.budget.id, group.id),
[:admin, group.budget, group, heading],
method: :delete,
class: "button hollow alert" %>
<% end %>
</td>
</tr>

View File

@@ -1,58 +0,0 @@
<%= form_for [:admin, budget, group, heading], remote: true do |f| %>
<%= render 'shared/errors', resource: heading %>
<%= f.text_field :name,
label: t("admin.budgets.form.heading"),
maxlength: 50,
placeholder: t("admin.budgets.form.heading") %>
<div class="row">
<div class="small-12 medium-6 column">
<%= f.text_field :price,
label: t("admin.budgets.form.amount"),
maxlength: 8,
placeholder: t("admin.budgets.form.amount") %>
</div>
</div>
<div class="row">
<div class="small-12 medium-6 column">
<p class="help-text" id="budgets-population-help-text">
<%= t("admin.budgets.form.population_help_text") %>
</p>
<%= f.text_field :population,
label: t("admin.budgets.form.population"),
maxlength: 8,
placeholder: t("admin.budgets.form.population"),
data: {toggle_focus: "population-info"},
aria: {describedby: "budgets-population-help-text"} %>
</div>
<div class="small-12 medium-6 column " >
<div id="population-info" class="is-hidden" data-toggler="is-hidden">
<%= t("admin.budgets.form.population_info") %>
</div>
</div>
</div>
<div class="row">
<div class="small-12 medium-6 column">
<%= f.text_field :latitude,
label: t("admin.budgets.form.latitude"),
maxlength: 22,
placeholder: "latitude" %>
</div>
</div>
<div class="row">
<div class="small-12 medium-6 column">
<%= f.text_field :longitude,
label: t("admin.budgets.form.longitude"),
maxlength: 22,
placeholder: "longitude" %>
</div>
</div>
<div class="row">
<div class="small-12 medium-6 column">
<%= f.check_box :allow_custom_content, label: t('admin.budgets.form.allow_content_block') %>
</div>
</div>
<%= f.submit t("admin.budgets.form.save_heading"), class: "button success" %>
<% end %>

View File

@@ -1,2 +0,0 @@
<%= t("admin.budgets.form.max_votable_headings")%>
<%= t("admin.budgets.form.current_of_max_headings", current: current, max: max) %>