end
def save
- metric=Metric.by_key(params[:metric])
- measure=ManualMeasure.find(:first, :conditions => ['resource_id=? and metric_id=?', @resource.id, metric.id])
- if measure.nil?
- measure=ManualMeasure.new(:resource => @resource, :user_login => current_user.login, :metric_id => metric.id)
+ @metric=Metric.by_key(params[:metric])
+ @measure=ManualMeasure.find(:first, :conditions => ['resource_id=? and metric_id=?', @resource.id, @metric.id])
+ if @measure.nil?
+ @measure=ManualMeasure.new(:resource => @resource, :user_login => current_user.login, :metric_id => @metric.id)
end
- # TODO use measure.text_value if string metric
- measure.value = params[:val]
- measure.description = params[:desc]
- measure.save!
- if (params[:redirect_to_new]=='true')
- redirect_to :action => 'new', :id => params[:id]
+ @measure.typed_value=params[:val]
+ @measure.description=params[:desc]
+ if @measure.valid?
+ @measure.save
+ if (params[:redirect_to_new]=='true')
+ redirect_to :action => 'new', :id => params[:id]
+ else
+ redirect_to :action => 'index', :id => params[:id], :metric => params[:metric]
+ end
else
- redirect_to :action => 'index', :id => params[:id], :metric => params[:metric]
+ render :action => :new, :metric => @metric.id, :id => params[:id]
end
end
# i18n
def message(key, options={})
- default = options[:default]
- params = options[:params]
- if params.nil?
- params=[]
- end
- Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, key, default, params.to_java)
+ Api::Utils.message(key, options)
end
# deprecated since 2.5. Use trend_icon() instead
# See http://jira.codehaus.org/browse/SONAR-2571
split_newlines(input).join("\n")
end
+
+ #
+ # i18n
+ # Since 2.10
+ def self.message(key, options={})
+ default = options[:default]
+ params = options[:params]
+ if params.nil?
+ params=[]
+ end
+ Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, key, default, params.to_java)
+ end
end
def name
if on_metric?
- Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, "metric." + kee + ".name", metric.short_name, [].to_java)
+ Api::Utils.message("metric." + kee + ".name", :default => metric.short_name)
else
- Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, family, kee, [].to_java)
+ Api::Utils.message(family, :default => kee)
end
end
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02
#
class ManualMeasure < ActiveRecord::Base
+ include ActionView::Helpers::NumberHelper
+
belongs_to :resource, :class_name => 'Project'
validates_uniqueness_of :metric_id, :scope => :resource_id
validates_length_of :text_value, :maximum => 4000, :allow_nil => true, :allow_blank => true
validates_length_of :description, :maximum => 4000, :allow_nil => true, :allow_blank => true
- validate :validate_metric
+ validate :validate_metric, :validate_value
def metric
@metric ||=
write_attribute(:metric_id, m.id) if m.id
end
+ def typed_value=(v)
+ if metric && metric.numeric?
+ self.value=v
+ else
+ self.text_value=v
+ end
+ end
+
+ def pending?(snapshot=nil)
+ if snapshot.nil?
+ snapshot=resource.last_snapshot
+ end
+ snapshot && updated_at && snapshot.created_at<updated_at
+ end
+
+ def formatted_value
+ if metric.nil?
+ return value.to_s
+ end
+
+ case metric().val_type
+ when Metric::VALUE_TYPE_INT
+ number_with_precision(value(), :precision => 0)
+ when Metric::VALUE_TYPE_FLOAT
+ number_with_precision(value(), :precision => 1)
+ when Metric::VALUE_TYPE_PERCENT
+ number_to_percentage(value(), {:precision => 1})
+ when Metric::VALUE_TYPE_MILLISEC
+ millisecs_formatted_value(value())
+ when Metric::VALUE_TYPE_BOOLEAN
+ value() == 1 ? 'Yes' : 'No'
+ when Metric::VALUE_TYPE_LEVEL
+ Sonar::RulePriority.to_s(value)
+ when Metric::VALUE_TYPE_STRING
+ text_value
+ when Metric::VALUE_TYPE_RATING
+ text_value || value.to_i.to_s
+ else
+ value().to_s
+ end
+ end
+
+ def editable_value
+ if metric.nil?
+ return ''
+ end
+
+ if metric.numeric?
+ value ? value.to_s : ''
+ elsif metric.value_type==Metric::VALUE_TYPE_BOOLEAN
+ value ? (value==1 ? 'Yes' : 'No') : ''
+ elsif metric.value_type==Metric::VALUE_TYPE_LEVEL
+ text_value ? Sonar::RulePriority.to_s(text_value) : ''
+ else
+ text_value
+ end
+ end
+
def validate_metric
if metric.nil? || !metric.enabled?
errors.add_to_base("Unknown metric")
end
end
- def pending?(snapshot=nil)
- if snapshot.nil?
- snapshot=resource.last_snapshot
+ def validate_value
+ if metric
+ case metric.value_type
+ when Metric::VALUE_TYPE_INT
+ errors.add('value', "An integer value must be provided") if value_before_type_cast.nil? || !Api::Utils.is_integer?(value_before_type_cast)
+ when Metric::VALUE_TYPE_FLOAT
+ errors.add('value', "A numerical value must be provided") if value_before_type_cast.nil? || !Api::Utils.is_number?(value_before_type_cast)
+ when Metric::VALUE_TYPE_PERCENT
+ errors.add('value', "A numerical value must be provided") if value_before_type_cast.nil? || !Api::Utils.is_number?(value_before_type_cast)
+ when Metric::VALUE_TYPE_MILLISEC
+ errors.add('value', "Value must equal or be greater than 0") if value_before_type_cast.nil? || !Api::Utils.is_number?(value_before_type_cast) || value<0
+ when Metric::VALUE_TYPE_BOOLEAN
+ raw_value = text_value.downcase
+ errors.add('value', "Value must be 'No' or 'Yes'") if raw_value != "yes" && raw_value != "no"
+ write_attribute("value", 1.0) if raw_value == "yes"
+ write_attribute("value", 0.0) if raw_value == "no"
+ when Metric::VALUE_TYPE_LEVEL
+ raw_value = text_value.upcase
+ errors.add('value', "Value must be BLOCKER, CRITICAL, MAJOR, MINOR or INFO") if !['BLOCKER', 'CRITICAL', 'MAJOR', 'MINOR', 'INFO'].include?(raw_value)
+ write_attribute("value", Sonar::RulePriority.id(raw_value))
+ write_attribute("text_value", raw_value)
+ end
end
- snapshot && updated_at && snapshot.created_at<updated_at
end
+
end
\ No newline at end of file
return localeMap[locale] if not localeMap.nil? and localeMap.has_key?(locale)
i18n_key = 'domain.' + to_translate
- result = Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, i18n_key, to_translate, [].to_java)
- localeMap[locale] = result if not localeMap.nil?
+ result = Api::Utils.message(i18n_key, :default => to_translate)
+ localeMap[locale] = result if localeMap
result
end
return localeMap[locale] if localeMap && localeMap.has_key?(locale)
i18n_key = 'metric.' + metric_key + '.name'
- result = Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, i18n_key, default_string, [].to_java)
+ result = Api::Utils.message(i18n_key, :default => default_string)
localeMap[locale] = result if localeMap
result
end
return nil if metric_name.nil?
i18n_key = 'metric.' + metric_name + '.description'
- result = Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, i18n_key, default_string, [].to_java)
+ result = Api::Utils.message(i18n_key, :default => default_string)
result
end
return default_string unless translate
i18n_key = 'project_links.' + read_attribute(:link_type)
- Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, i18n_key, default_string, [].to_java)
+ Api::Utils.message(i18n_key, :default => default_string)
end
def self.name_to_key(s)
belongs_to :characteristic
has_one :measure_data, :class_name => 'MeasureData', :foreign_key => 'measure_id'
- validates_numericality_of :value, :if => :numerical_metric?
- validate :validate_date, :validate_value
-
def metric
@metric ||=
begin
end
def <=>(other)
- return value<=>other.value
+ value<=>other.value
end
private
[Metric::VALUE_TYPE_INT, Metric::VALUE_TYPE_FLOAT, Metric::VALUE_TYPE_PERCENT, Metric::VALUE_TYPE_MILLISEC].include?(metric.val_type)
end
- def validate_date
- if measure_date.nil?
- errors.add_to_base('A valid date must be provided')
- else
- last_snasphot_date = project.last_snapshot.created_at
- if project.last_snapshot.created_at < measure_date
- errors.add_to_base("The date should not be after #{last_snasphot_date.strftime('%Y-%m-%d')}")
- end
- end
- end
-
- def validate_value
- case metric.value_type
- when Metric::VALUE_TYPE_INT
- errors.add_to_base("A numerical value must be provided") if value.nil?
- when Metric::VALUE_TYPE_FLOAT
- errors.add_to_base("A numerical value must be provided") if value.nil?
- when Metric::VALUE_TYPE_PERCENT
- errors.add_to_base("A numerical value must be provided") if value.nil?
- when Metric::VALUE_TYPE_MILLISEC
- errors.add_to_base("Value must be greater than 0") if value < 0
- when Metric::VALUE_TYPE_BOOLEAN
- raw_value = send("value_before_type_cast")
- if raw_value.instance_of?(String)
- raw_value = raw_value.downcase
- errors.add_to_base("Value must be 'No' or 'Yes'") if raw_value != "yes" && raw_value != "no"
- write_attribute( "value", 1.0) if raw_value == "yes"
- write_attribute( "value", 0.0) if raw_value == "no"
- end
- when Metric::VALUE_TYPE_STRING
- errors.add_to_base("A text value must be provided") if text_value.blank?
- end
- end
-
end
\ No newline at end of file
return nil if (rule_plugin_name.nil? or rule_plugin_rule_key.nil?)
i18n_key = 'rule.' + rule_plugin_name + '.' + rule_plugin_rule_key + '.name'
- result = Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, i18n_key, default_string, [].to_java)
+ result = Api::Utils.message(i18n_key, :default => default_string)
result
end
return nil if (rule_plugin_name.nil? or rule_plugin_rule_key.nil?)
i18n_key = 'rule.' + rule_plugin_name + '.' + rule_plugin_rule_key + '.description'
- result = Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, i18n_key, default_string, [].to_java)
+ result = Api::Utils.message(i18n_key, :default => default_string)
result
end
return nil if (rule_plugin_name.nil? or rule_plugin_rule_key.nil?)
i18n_key = 'rule.' + rule_plugin_name + '.' + rule_plugin_rule_key + '.param.' + read_attribute(:name)
- result = Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, i18n_key, default_string, [].to_java)
+ result = Api::Utils.message(i18n_key, :default => default_string)
result
end
return text unless translate
i18n_key = 'severity.' + text
- result = Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, i18n_key, as_text_map[text], [].to_java)
+ result = Api::Utils.message(i18n_key, :default => as_text_map[text])
result
end
nil
end
end
-
+
def self.as_array
@@priorities_a ||= []
return @@priorities_a if @@priorities_a.size > 0
<thead>
<tr>
<th style="padding: 0; margin: 0" class="nosort"></th>
- <th class="thin nowrap sortfirstasc"><%= message('manual_measures.col.domain') -%></th>
- <th class="thin nowrap"><%= message('manual_measures.col.metric') -%></th>
- <th class="thin nowrap" style="text-align: right"><%= message('manual_measures.col.value') -%></th>
+ <th class="thin nowrap"><%= message('manual_measures.col.domain') -%></th>
+ <th class="thin nowrap sortfirstasc"><%= message('manual_measures.col.metric') -%></th>
+ <th class="thin nowrap nosort" style="text-align: right"><%= message('manual_measures.col.value') -%></th>
<th><%= message('manual_measures.col.description') -%></th>
<th style="text-align: right"><%= message('manual_measures.col.author') -%></th>
<th style="text-align: right"><%= message('manual_measures.col.date') -%></th>
<% end %>
<td class="thin nowrap"><%= measure.metric.domain -%></td>
<td class="thin nowrap"><%= measure.metric.short_name -%></td>
- <td class="thin nowrap" align="right"><%= measure.value -%></td>
+ <td class="thin nowrap" align="right"><%= measure.formatted_value -%></td>
<td id="desc"><%= measure.description -%></td>
<td align="right"><%= measure.username -%>
</td>
}
</script>
<h1 class="marginbottom10"><%= message('manual_measures.add_measure_title') -%></h1>
+
+<% if @measure && @measure.errors.on_base
+ @measure.errors.on_base.each do |error| %>
+ <div class="error"><%= error -%></div>
+<% end
+ end
+%>
+
<form action="<%= url_for :action => (@measure ? 'save' : 'new') -%>" method="POST" id="createForm">
<input type="hidden" name="id" value="<%= @resource.id -%>"/>
<table class="width100 form">
<tbody>
<tr>
<td class="keyCell">
- Metric:
+ <%= message('manual_measures.col.metric') -%>:
</td>
<td>
<select name="metric" onchange="changeMetric();" id="metricSelect">
<%= message('manual_measures.col.value') -%>:
</td>
<td>
- <input type="text" name="val" id="valueText" value="<%= @measure.value -%>"/>
+ <input type="text" name="val" id="valueText" value="<%= @measure ? @measure.editable_value : '' -%>"/>
+ <%= '%' if @metric && @metric.value_type==Metric::VALUE_TYPE_PERCENT -%>
+ <% if @measure.errors.on('value')
+ @measure.errors.on('value').each do |error| %>
+ <span class="error"><%= error -%></span>
+ <% end
+ end %>
</td>
</tr>
<tr>
</td>
<td>
<textarea rows="5" cols="80" name="desc" class="width100"><%= @measure.description -%></textarea>
+ <% if @measure.errors.on('description')
+ @measure.errors.on('description').each do |error| %>
+ <span class="error"><%= error -%></span>
+ <% end
+ end %>
</td>
</tr>
<% unless @measure.new_record?() %>
projects / sonarqube.git / commitdiff