Skip to content

Commit d35361d

Browse files
jeremiahebjeremiaheb
committed
convert float to int types, edit specs, fix deprecations
1 parent 5169e22 commit d35361d

19 files changed

+83
-574
lines changed

‎app/assets/javascripts/benthic_covers.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,18 +310,18 @@ $(function(){
310310
function validate_fields() {
311311
$('[name*="hardbottom_num"]').each(function(){
312312
$(this).rules('add', {
313-
number: true,
313+
digits: true,
314314
isOnlyCat: true
315315
});
316316
});
317317
$('[name*="softbottom_num"]').each(function(){
318318
$(this).rules('add', {
319-
number: true
319+
digits: true
320320
});
321321
});
322322
$('[name*="rubble_num"]').each(function(){
323323
$(this).rules('add', {
324-
number: true
324+
digits: true
325325
});
326326
});
327327

‎app/assets/javascripts/coral_demographics.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,42 +153,42 @@ $(function(){
153153
$('[name*="meter_mark"]').each(function(){
154154
$(this).rules('add', {
155155
required: true,
156-
number: true,
156+
digits: true,
157157
min: 0
158158
});
159159
});
160160
$('[name*="max_diameter"]').each(function(){
161161
$(this).rules('add', {
162162
required: true,
163-
number: true,
163+
digits: true,
164164
min: 1
165165
});
166166
});
167167
$('[name*="perpendicular_diameter"]').each(function(){
168168
$(this).rules('add', {
169169
required: true,
170-
number: true,
170+
digits: true,
171171
min: 1,
172172
lessThan: true
173173
});
174174
});
175175
$('[name*="height"]').each(function(){
176176
$(this).rules('add', {
177177
required: true,
178-
number: true,
178+
digits: true,
179179
min: 1
180180
});
181181
});
182182
$('[name*="old_mortality"]').each(function(){
183183
$(this).rules('add', {
184184
required: true,
185-
number: true
185+
digits: true
186186
});
187187
});
188188
$('[name*="recent_mortality"]').each(function(){
189189
$(this).rules('add', {
190190
required: true,
191-
number: true,
191+
digits: true,
192192
notGreaterThan100: true
193193
});
194194
});

‎app/assets/javascripts/samples.js.erb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -809,29 +809,29 @@ $(function(){
809809
$('[name*="number_individuals"]').each(function(){
810810
$(this).rules('add', {
811811
required: true,
812-
number: true,
812+
digits: true,
813813
isNotInPreviousTimePeriod: true
814814
});
815815
});
816816
$('[name*="average_length"]').each(function(){
817817
$(this).rules('add', {
818818
requiredIfEnabled: true,
819-
number: true,
819+
digits: true,
820820
doesNotHaveOverlap: true
821821
});
822822
});
823823
$('[name*="min_length"]').each(function(){
824824
$(this).rules('add', {
825825
requiredIfEnabled: true,
826-
number: true,
826+
digits: true,
827827
lessThan: true,
828828
doesNotHaveOverlap: true
829829
});
830830
});
831831
$('[name*="max_length"]').each(function(){
832832
$(this).rules('add', {
833833
requiredIfEnabled: true,
834-
number: true,
834+
digits: true,
835835
greaterThanEqualToAvg: true,
836836
greaterThanEqualToMin: true,
837837
doesNotHaveOverlap: true

‎app/models/demographic_coral.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class DemographicCoral < ActiveRecord::Base
55
belongs_to :coral
66

77
default_scope -> { order("id ASC") }
8-
validates :meter_mark, :max_diameter, :perpendicular_diameter, :height, :old_mortality, :recent_mortality, :bleach_condition, :disease, :presence => true, :if => "coral_id != 1"
8+
validates :meter_mark, :max_diameter, :perpendicular_diameter, :height, :old_mortality, :recent_mortality, :bleach_condition, :disease, :presence => true, if: -> {coral_id != 1}
99
validates :max_diameter, :perpendicular_diameter, :height, :numericality => { :greater_than => 0 }
1010
validates :perpendicular_diameter, :numericality => { :less_than_or_equal_to => :max_diameter }
1111

‎app/models/rugosity_measure.rb‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,26 @@ class RugosityMeasure < ActiveRecord::Base
66
validates :min_depth, :presence => true
77
validates :max_depth, :presence => true
88
validates :rug_meters_completed, :presence => true
9-
validates :meter_mark_1, :presence => true, :if => "rug_meters_completed >= 1"
10-
validates :meter_mark_2, :presence => true, :if => "rug_meters_completed >= 2"
11-
validates :meter_mark_3, :presence => true, :if => "rug_meters_completed >= 3"
12-
validates :meter_mark_4, :presence => true, :if => "rug_meters_completed >= 4"
13-
validates :meter_mark_5, :presence => true, :if => "rug_meters_completed >= 5"
14-
validates :meter_mark_6, :presence => true, :if => "rug_meters_completed >= 6"
15-
validates :meter_mark_7, :presence => true, :if => "rug_meters_completed >= 7"
16-
validates :meter_mark_8, :presence => true, :if => "rug_meters_completed >= 8"
17-
validates :meter_mark_9, :presence => true, :if => "rug_meters_completed >= 9"
18-
validates :meter_mark_10, :presence => true, :if => "rug_meters_completed >= 10"
19-
validates :meter_mark_11, :presence => true, :if => "rug_meters_completed >= 11"
20-
validates :meter_mark_12, :presence => true, :if => "rug_meters_completed >= 12"
21-
validates :meter_mark_13, :presence => true, :if => "rug_meters_completed >= 13"
22-
validates :meter_mark_14, :presence => true, :if => "rug_meters_completed >= 14"
23-
validates :meter_mark_15, :presence => true, :if => "rug_meters_completed >= 15"
9+
validates :meter_mark_1, :presence => true, if: -> { rug_meters_completed >= 1 }
10+
validates :meter_mark_2, :presence => true, if: -> { rug_meters_completed >= 2 }
11+
validates :meter_mark_3, :presence => true, if: -> { rug_meters_completed >= 3 }
12+
validates :meter_mark_4, :presence => true, if: -> { rug_meters_completed >= 4 }
13+
validates :meter_mark_5, :presence => true, if: -> { rug_meters_completed >= 5 }
14+
validates :meter_mark_6, :presence => true, if: -> { rug_meters_completed >= 6 }
15+
validates :meter_mark_7, :presence => true, if: -> { rug_meters_completed >= 7 }
16+
validates :meter_mark_8, :presence => true, if: -> { rug_meters_completed >= 8 }
17+
validates :meter_mark_9, :presence => true, if: -> { rug_meters_completed >= 9 }
18+
validates :meter_mark_10, :presence => true, if: -> { rug_meters_completed >= 10 }
19+
validates :meter_mark_11, :presence => true, if: -> { rug_meters_completed >= 11 }
20+
validates :meter_mark_12, :presence => true, if: -> { rug_meters_completed >= 12 }
21+
validates :meter_mark_13, :presence => true, if: -> { rug_meters_completed >= 13 }
22+
validates :meter_mark_14, :presence => true, if: -> { rug_meters_completed >= 14 }
23+
validates :meter_mark_15, :presence => true, if: -> { rug_meters_completed >= 15 }
2424

2525

2626
def category_sum
27-
[meter_mark_1, meter_mark_2].sum
27+
[meter_mark_1, meter_mark_2, meter_mark_3, meter_mark_4, meter_mark_5, meter_mark_6, meter_mark_7, meter_mark_8, meter_mark_9, meter_mark_10,
28+
meter_mark_11, meter_mark_12, meter_mark_13, meter_mark_14, meter_mark_15].sum
2829
end
2930

3031
end

‎app/models/sample.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ def diver
5252
validates :soft_verticle_relief, :presence => true, :numericality => true
5353

5454
validates :hard_relief_cat_0, :presence => true, :numericality => { :only_integer => true, :greater_than => 0 }
55-
validates :hard_relief_cat_1, :presence => true, :if => "hard_verticle_relief > 0.2", :numericality => { :only_integer => true, :greater_than => 0 }
56-
validates :hard_relief_cat_2, :presence => true, :if => "hard_verticle_relief > 0.5", :numericality => { :only_integer => true, :greater_than => 0 }
57-
validates :hard_relief_cat_3, :presence => true, :if => "hard_verticle_relief > 1.0", :numericality => { :only_integer => true, :greater_than => 0 }
58-
validates :hard_relief_cat_4, :presence => true, :if => "hard_verticle_relief > 1.5", :numericality => { :only_integer => true, :greater_than => 0 }
55+
validates :hard_relief_cat_1, :presence => true, if: -> {hard_verticle_relief > 0.2}, :numericality => { :only_integer => true, :greater_than => 0 }
56+
validates :hard_relief_cat_2, :presence => true, if: -> {hard_verticle_relief > 0.5}, :numericality => { :only_integer => true, :greater_than => 0 }
57+
validates :hard_relief_cat_3, :presence => true, if: -> {hard_verticle_relief > 1.0}, :numericality => { :only_integer => true, :greater_than => 0 }
58+
validates :hard_relief_cat_4, :presence => true, if: -> {hard_verticle_relief > 1.5}, :numericality => { :only_integer => true, :greater_than => 0 }
5959

6060
validate :hard_relief_cats_equal_100
6161
validate :soft_relief_cats_equal_100

0 commit comments

Comments
 (0)