dinislage/redmine_overhead
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#2281] Refactored the implementation of billable?.

Browse Source
This commit is contained in:
Eric Davis
2009-04-21 16:59:55 -07:00
parent efb58740a3
commit ea38554820
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/overhead_time_entry_activity_patch.rb
View File

@@ -19,22 +19,34 @@ module OverheadTimeEntryActivityPatch
module InstanceMethods
# Is the Activity Billable, based on it's custom data?
def billable?
if Setting['plugin_redmine_overhead'] && Setting['plugin_redmine_overhead']['custom_field']
if overhead_configured?
billable_field = TimeEntryActivityCustomField.find_by_id(Setting['plugin_redmine_overhead']['custom_field'])
return field_equals_the_configured_billable_field?(billable_field)
else
return false
end
end
if billable_field && field = self.custom_value_for(billable_field)
if billable_field.field_format == 'bool'
private
def overhead_configured?
Setting['plugin_redmine_overhead'] && Setting['plugin_redmine_overhead']['custom_field']
end
# Checks if the field's value equals the configured billable
# value.
def field_equals_the_configured_billable_field?(field=nil)
return false unless field
custom_value = self.custom_value_for(field)
if field.field_format == 'bool'
# Map string values to proper booleans
setting = (Setting['plugin_redmine_overhead']['billable_value'] == "true") ? true : false
activity_field = (field.value == "1") ? true : false
activity_field = (custom_value.value == "1") ? true : false
return activity_field == setting
else
return field.value == Setting['plugin_redmine_overhead']['billable_value']
end
else
return false
end
else
return false
return custom_value.value == Setting['plugin_redmine_overhead']['billable_value']
end
end
end