From d3747526fdcb2066fe8d7e05733eb9173d0e2010 Mon Sep 17 00:00:00 2001 From: Fellipe Souto Sampaio Date: Fri, 25 Apr 2014 16:45:59 -0300 Subject: [PATCH] Making the metric configuration form view conform to the tooltips specification. --- app/views/metric_configurations/_form.html.erb | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------- app/views/metric_configurations/edit.html.erb | 5 ++++- app/views/metric_configurations/new.html.erb | 6 +++++- 3 files changed, 66 insertions(+), 24 deletions(-) diff --git a/app/views/metric_configurations/_form.html.erb b/app/views/metric_configurations/_form.html.erb index 7b4f517..7176015 100644 --- a/app/views/metric_configurations/_form.html.erb +++ b/app/views/metric_configurations/_form.html.erb @@ -1,31 +1,66 @@ <%= render :partial => 'shared/form_errors', :locals => {:object => @metric_configuration} %> -
- <%= f.label :code, class: 'control-label' %> - <%= f.text_field :code, class: 'form-control' %> -
+
+
-
- <%= f.label :weight, class: 'control-label' %> - <%= f.text_field :weight, class: 'form-control' %> -
+
+
+ <%= f.label :code, class: 'control-label' %> + <%= f.text_field :code, class: 'text-field' %> +
+
+

+ Code it is a variable that holds the value of a metric analysis. It's used inside a compound metric +

+

+ Example : + Code foo := 10 +

+
+
-
- <%= f.label :aggregation_form, 'Aggregation Form', class: 'control-label' %> - <%= f.select( :aggregation_form, aggregation_options, {class: 'form-control'} ) %> -
+
+
+ <%= f.label :weight, class: 'control-label' %> + <%= f.text_field :weight, class: 'text-field' %> +
+
+

+ It's the weight of the metric +

+
+
+ +
+
+ <%= f.label :aggregation_form, 'Aggregation Form', class: 'control-label' %> + <%= f.select( :aggregation_form, aggregation_options, {class: 'form-control'} ) %> +
+
+

+ It's the aggregation form of the metric +

+
+
+ + <% if @metric_configuration.persisted? %> + <%= hidden_field_tag(:reading_group_id, @metric_configuration.reading_group_id) %> + <% else %> +
+
+ <%= f.label :reading_group_id, 'Reading Group', class: 'control-label' %> + <%= f.select( :reading_group_id, reading_group_options, {class: 'form-control'} ) %> +
+
+

+ The reading group that is associated with this metric +

+
+
+ <% end %> -<% if @metric_configuration.persisted? %> - <%= hidden_field_tag(:reading_group_id, @metric_configuration.reading_group_id) %> -<% else %> -
- <%= f.label :reading_group_id, 'Reading Group', class: 'control-label' %> - <%= f.select( :reading_group_id, reading_group_options, {class: 'form-control'} ) %>
-<% end %> +
<%= hidden_field_tag(:metric_name, @metric_configuration.metric.name) %> <%= hidden_field_tag(:base_tool_name, @metric_configuration.base_tool_name) %> - -
-<%= f.submit 'Save', class: 'btn btn-primary' %> diff --git a/app/views/metric_configurations/edit.html.erb b/app/views/metric_configurations/edit.html.erb index 6e9c350..7404ef9 100644 --- a/app/views/metric_configurations/edit.html.erb +++ b/app/views/metric_configurations/edit.html.erb @@ -4,5 +4,8 @@ <%= form_for(@metric_configuration, :url => mezuro_configuration_metric_configuration_update_url(@mezuro_configuration_id, @metric_configuration.id), method: :put) do |f| %> <%= render partial: 'form', locals: {f: f} %> - <%= link_to 'Back', mezuro_configuration_path(@metric_configuration.configuration_id), class: 'btn btn-default' %> +
+ <%= f.submit 'Save', class: 'btn btn-primary' %> + <%= link_to 'Back', mezuro_configuration_path(@metric_configuration.configuration_id), class: 'btn btn-default' %> +
<% end %> diff --git a/app/views/metric_configurations/new.html.erb b/app/views/metric_configurations/new.html.erb index bc9393a..979b776 100644 --- a/app/views/metric_configurations/new.html.erb +++ b/app/views/metric_configurations/new.html.erb @@ -23,5 +23,9 @@ <%= form_for(@metric_configuration, :url => mezuro_configuration_metric_configurations_path(@metric_configuration.configuration_id)) do |f| %> <%= render partial: 'form', locals: {f: f} %> - <%= link_to 'Back', mezuro_configuration_choose_metric_path(@metric_configuration.configuration_id), class: 'btn btn-default' %> +
+ <%= f.submit 'Save', class: 'btn btn-primary' %> + <%= link_to 'Back', mezuro_configuration_choose_metric_path(@metric_configuration.configuration_id), class: 'btn btn-default' %> +
+ <% end %> -- libgit2 0.21.2