appraisermetrics_report_service 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fd92e7b4a236becc82495be48c555dafac68eaa
-  data.tar.gz: 2ac74975fbae9952a9e97436f5df0d5d4e57a681
+  metadata.gz: 2470ef58844451b904f67492255e8cfcdea82328
+  data.tar.gz: a6a1540cdb8b8812b373aa8190bdaab6f0fbf145
 SHA512:
-  metadata.gz: 90e7a35b0f564082348ad340479e51b92617e57962f11380aa55da8b1f81624e52f614de75965f85bea8d4c9bce01b6f3206ae06fad64c8bd493b80915dd81cc
-  data.tar.gz: c2fa64a42ed4de775070624d9b28c04e04bd9f5ebef53f272f984ec5356ed825dcaeed8288c1eb6be8261ba40fb23238d6b934dece8b5451c474e521159eb834
+  metadata.gz: 362d720e74c6852e3908ca0370bae2d528a7cb77d6b8459e83fd5230bcee33acd848200d51b15bf9baca030d5831b5259c16fa573e933e15ec6983371bcd7812
+  data.tar.gz: b52f962220829d673c4380e8c7959d8b26b2ae65bfc0874dee3313609c1990b3f742eb2e749a99e88b558267bad3a88e380c5f9aa32a8eb9fa02cb519b48f852

data/lib/appraisermetrics_report_service/version.rb

@@ -1,3 +1,3 @@
 module AppraisermetricsReportService
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/closed_sale.rb

@@ -610,15 +610,20 @@ class ClosedSale < Prawn::Document
 	def water_rights
 		water_rights_data = [
 			[{content: "Water Rights", colspan: 8}],
-			["Water Right No.", "Water Right", "Water Source", "Priority Date", "Beneficial Use", "No. Acres Irrigated", "Annual Volume Ac-Ft", "Period of Use"]
+			["Water Right No.", "Water Right", "Water Source", "Priority Date", "Beneficial Use", "No. Acres Irrigated", "Annual Volume Ac-Ft", "Ac-Ft per Acre"]
 		]
 
 		rights = @rep[:waterrights]
 		if rights # node could be nil
 			rights.each do |r|
 				if r # array could be empty
+					if !r[:numIrrAcres] || r[:numIrrAcres] == 0
+						ac_ft_per = 0
+					else
+						ac_ft_per = (no_nil_number(r[:annVolume]).to_f / r[:numIrrAcres].to_f).round(1)
+					end
 					water_rights_data.push(
-						["#{r[:waterrightNum]}", "#{r[:waterRight]}", "#{r[:waterSrc]}", datemaker(r[:priorityDate]), "#{r[:purpose]}", "#{r[:numIrrAcres]}", "#{r[:annVolume]}"]
+						["#{r[:waterrightNum]}", "#{r[:waterRight]}", "#{r[:waterSrc]}", datemaker(r[:priorityDate]), "#{r[:purpose]}", "#{r[:numIrrAcres]}", "#{r[:annVolume]}", "#{ac_ft_per}"]
 					)
 				end
 			end

data/lib/eval_report.rb

@@ -1206,15 +1206,20 @@ class EvalReport < Prawn::Document
 	def water_rights
 		water_rights_data = [
 			[{content: "Water Rights", colspan: 8}],
-			["Water Right No.", "Water Right", "Water Source", "Priority Date", "Beneficial Use", "No. Acres Irrigated", "Annual Volume Ac-Ft", "Period of Use"]
+			["Water Right No.", "Water Right", "Water Source", "Priority Date", "Beneficial Use", "No. Acres Irrigated", "Annual Volume Ac-Ft", "Ac-Ft per Acre"]
 		]
 
 		rights = @sub[:waterrights]
 		if rights # node could be nil
 			rights.each do |r|
 				if r # array could be empty
+					if !r[:numIrrAcres] || r[:numIrrAcres] == 0
+						ac_ft_per = 0
+					else
+						ac_ft_per = (no_nil_number(r[:annVolume]).to_f / r[:numIrrAcres].to_f).round(1)
+					end
 					water_rights_data.push(
-						["#{r[:waterrightNum]}", "#{r[:waterRight]}", "#{r[:waterSrc]}", datemaker(r[:priorityDate]), "#{r[:purpose]}", "#{r[:numIrrAcres]}", "#{r[:annVolume]}"]
+						["#{r[:waterrightNum]}", "#{r[:waterRight]}", "#{r[:waterSrc]}", datemaker(r[:priorityDate]), "#{r[:purpose]}", "#{r[:numIrrAcres]}", "#{r[:annVolume]}", "#{ac_ft_per}"]
 					)
 				end
 			end

data/spec/lib/closed_sale_spec.rb

@@ -1,6 +1,16 @@
 require 'spec_helper'
 
 describe 'closed_sale class' do
+
+	describe 'write_content' do
+		it 'should render without breaking' do # check for syntax errors
+			@pdf = ClosedSale.new do
+				@rep = Sampler.get_comp2
+				write_content(Sampler.get_comp2, Sampler.sample_closed_sale_images, Sampler.sample_logo)
+			end
+		end
+	end
+
 	describe 'meta data table' do # meta data
 		context 'keys present' do
 			before :each do

data/spec/lib/eval_report_spec.rb

@@ -2,6 +2,16 @@ require 'spec_helper'
 
 describe 'eval report class' do
 
+	describe '#write_content' do
+		it 'contains no obvious syntax errors' do
+			r = EvalReport.new do
+      comps = []
+      8.times {|c| comps << Sampler.get_comp2}
+      write_content(Sampler.get_eval1, comps, Sampler.sample_logo, Sampler.sample_eval_docs)
+    	end
+		end
+	end
+
 	describe '#meta_data' do
 		context 'with keys' do
 			it 'renders static content' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appraisermetrics_report_service
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - StackPoint
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ttfunk