appraisermetrics_report_service 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76209e93e69b409b9e9c24ceca2dac133599adfd
-  data.tar.gz: 6183ca92a72da04e99b70000f7591fb37160407d
+  metadata.gz: 1636e2ee5c97a81021794dc71ac8c49956ecc06e
+  data.tar.gz: 5bb6f84f088ae66e32edcb84c414d6169309e492
 SHA512:
-  metadata.gz: 58082fe0e600d82681f7db4f2614f9ba4fb4f5f0833fa383607b61fb467150996a6f1eaa390324d194569198d28799f77d291651af7dbc67294f99bf1562531b
-  data.tar.gz: ece0f82c35142dad2dc552e91e322cd03c957baafbac720aaa1a61a7f4cbdbd2d7702083262595e2c75a189e5304d239c729d601f9adf29972c19bb2aab3fb81
+  metadata.gz: 3393a08515e9e51bfb30c9cd0a31c884ec9ab2317f0b78a01e75202aeaccb77016e55936d90da05089986d9cf4ebe6d47a94b8c83866ebd94161290f2bbee59f
+  data.tar.gz: 3a1c7e7b48d80261efbf458ef4c1b70890c2f077eb69aff4a849dba13c33c3d931513bb409dcb8c1f0ab6f3d20a064b6a16739b25a422a23edf10155d13f7776

data/lib/appraisermetrics_report_service/version.rb

@@ -1,3 +1,3 @@
 module AppraisermetricsReportService
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/appraisermetrics_report_service.rb

@@ -6,4 +6,5 @@ module AppraisermetricsReportService
 	require 'report_utils'
 	require 'closed_sale'
 	require 'eval_report'
-end
+end
+I18n.enforce_available_locales = false

data/lib/closed_sale.rb

@@ -10,7 +10,7 @@ class ClosedSale < Prawn::Document
 	end
 
 	def write_content(report_doc, images, office_logo) # the call to add content to pdf
-		font_size 6
+		font_size 7
 		@rep = report_doc
 		@property_images = images
 		@office_logo = office_logo
@@ -19,6 +19,7 @@ class ClosedSale < Prawn::Document
 
 		# render office logo image if present
 		stroke_bounds
+		move_down 10
 		render_logo
 
 		# rendering tables
@@ -30,7 +31,7 @@ class ClosedSale < Prawn::Document
 			property_class
 		end
 
-		move_down 45
+		move_down 5
 		stroke_horizontal_rule
 		move_down 5
 		float do
@@ -42,7 +43,7 @@ class ClosedSale < Prawn::Document
 			transaction_summary
 		end
 
-		move_down 45
+		move_down 25
 		stroke_horizontal_rule
 		move_down 5
 		float do
@@ -53,7 +54,7 @@ class ClosedSale < Prawn::Document
 			physical_overview
 		end
 
-		move_down 45
+		move_down 15
 		stroke_horizontal_rule
 		move_down 5
 		float do
@@ -63,10 +64,12 @@ class ClosedSale < Prawn::Document
 		indent(270) do
 			income_expense
 		end
-		cursor_pos = cursor
-		stroke_line [270, 720], [270, cursor_pos]
 
-		start_new_page
+		stroke_line [270, 720], [270, 0]
+
+		if page_count == 1
+			start_new_page
+		end
 
 		## page 2 ##
 		stroke_horizontal_rule
@@ -79,55 +82,58 @@ class ClosedSale < Prawn::Document
 		indent(270) do
 			legal_transaction
 		end
-		move_down 45
+
+		# stroke boundary line
+		stroke_line [270, 720], [270, cursor]
+		move_down 30
 		stroke_horizontal_rule
 		move_down 5
 		# move to full width table
 		if @rep[:transactions] && @rep[:transactions].any?
 			transaction_history
-			move_down 45
+			move_down 30
 			stroke_horizontal_rule
 			move_down 5
 		end
 
 		if @rep[:utilities] && @rep[:utilities].any?
 			utilities
-			move_down 45
+			move_down 30
 			stroke_horizontal_rule
 			move_down 5
 		end
 
 		if @rep[:improvements] && @rep[:improvements].any?
 			improvements
-			move_down 45
+			move_down 30
 			stroke_horizontal_rule
 			move_down 5
 		end
 
 		if @rep[:waterrights] && @rep[:waterrights].any?
 			water_rights
-			move_down 45
+			move_down 30
 			stroke_horizontal_rule
 			move_down 5
 		end
 
 		if @rep[:waterdistributions] && @rep[:waterdistributions].any?
 			water_distribution
-			move_down 45
+			move_down 30
 			stroke_horizontal_rule
 			move_down 5
 		end
 		
 		if @rep[:crops] && @rep[:crops].any?
 			crop_yield
-			move_down 45
+			move_down 30
 			stroke_horizontal_rule
 			move_down 5
 		end
 
 		if @rep[:estimatedproductivity] && @rep[:estimatedproductivity].any?
 			estimated_productivity
-			move_down 45
+			move_down 30
 			stroke_horizontal_rule
 			move_down 5
 		end
@@ -137,7 +143,7 @@ class ClosedSale < Prawn::Document
 
 		if @rep[:plantings] && @rep[:plantings].any?
 			perm_plantings
-			move_down 45
+			move_down 30
 			stroke_horizontal_rule
 			move_down 5
 		end
@@ -153,7 +159,7 @@ class ClosedSale < Prawn::Document
 
 	def render_logo
 		if @office_logo
-			image @office_logo, height: 25
+			image @office_logo, height: 35
 		end
 	end
 
@@ -179,6 +185,13 @@ class ClosedSale < Prawn::Document
 		else
 			text "No Image"
 		end
+
+		table([["Property Location and Directions:"], ["#{@rep[:directions_or_ownership_comments]}"]]) do
+			cells.padding = [1, 2.5]
+			cells.style(border_width: 0)
+			column(0).width = 270
+			row(0).style(align: :center, background_color: 'd7d7d7', font_style: :bold)
+		end
 	end
 
 	def land_classification
@@ -243,7 +256,7 @@ class ClosedSale < Prawn::Document
 			columns(1..3).style(align: :right)
 			cells.style(border_width: 0)
 			cells.padding = [1, 2.5]
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 			row(1).style(align: :right, font_style: :bold, border_bottom_width: 0.5)
 			row(-3).style(border_bottom_width: 0.5, font_style: :bold)
 		end
@@ -277,7 +290,7 @@ class ClosedSale < Prawn::Document
 			columns(2..3).width = 67
 			columns(1..3).style(align: :right, font_style: :bold)
 			column(0).style(align: :left, font_style: :bold)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, border_top_width: 0.5)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, border_top_width: 0.5)
 			cells.style(border_width: 0)
 			row(1).style(border_bottom_width: 0.5, align: :center, font_style: nil)
 			cells.padding = [1, 2.5]
@@ -295,7 +308,7 @@ class ClosedSale < Prawn::Document
 			column(0).width = 270
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 		end
 	end
 
@@ -333,8 +346,7 @@ class ClosedSale < Prawn::Document
 			["City:", "#{@rep[:city]}", "County:", "#{@rep[:ordinance_authority]}"],
 			["State:", "#{@rep[:county_state]}".strip.split('').last(2).join(""), "Zip Code:", "#{@rep[:zip_code]}"],
 			["Township/Range:","#{@rep[:townshipINT]}" + "#{@rep[:rangeINT]}", "Section(s):", "#{@rep[:legal_description]}"],
-			["Latitude:", lat, "Longitude:", long],
-			[{content: "Property Location and Directions:" + "#{@rep[:directions_or_ownership_comments]}", colspan: 4}]
+			["Latitude:", lat, "Longitude:", long]
 		]
 
 		table(type_and_address_data) do
@@ -344,7 +356,7 @@ class ClosedSale < Prawn::Document
 			columns([1, 3]).style(font_style: :bold)
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 		end
 	end
 
@@ -372,7 +384,7 @@ class ClosedSale < Prawn::Document
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
 			columns([1, 3]).style(font_style: :bold)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 		end
 	end
 
@@ -398,8 +410,9 @@ class ClosedSale < Prawn::Document
 			columns([1, 3]).style(font_style: :bold)
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 			row(9).style(align: :left)
+			row(-1).style(align: :left)
 		end
 	end
 
@@ -429,7 +442,7 @@ class ClosedSale < Prawn::Document
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
 			columns([1, 3]).style(font_style: :bold)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 			row([5, 6]).style(align: :left)
 		end
 	end
@@ -464,7 +477,7 @@ class ClosedSale < Prawn::Document
 			columns([1, 3]).style(font_style: :bold)
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 		end
 	end
 
@@ -491,7 +504,7 @@ class ClosedSale < Prawn::Document
 			columns(0..3).style(align: :right, font_style: :bold)
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 			row(1).style(border_bottom_width: 0.5, font_style: nil)
 		end
 	end
@@ -518,7 +531,7 @@ class ClosedSale < Prawn::Document
 			columns(0..3).style(align: :right, font_style: :bold)
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 			row(1).style(border_bottom_width: 0.5, font_style: nil)
 		end
 	end
@@ -531,7 +544,7 @@ class ClosedSale < Prawn::Document
 		table(sorted_array) do
 			columns(0..7).width = 67.5
 			columns(1..7).style(font_style: :bold)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
 			row(1).style(border_bottom_width: 0.5, font_style: nil)
@@ -558,7 +571,7 @@ class ClosedSale < Prawn::Document
 		table(water_rights_data) do
 			columns(0..7).width = 67.5
 			columns(0..7).style(font_style: :bold)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
 			row(1).style(border_bottom_width: 0.5, font_style: nil)
@@ -586,7 +599,7 @@ class ClosedSale < Prawn::Document
 		table(distribution_data) do
 			columns(0..7).width = 67.5
 			columns(0..7).style(font_style: :bold)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
 			row(1).style(border_bottom_width: 0.5, font_style: nil)
@@ -615,7 +628,7 @@ class ClosedSale < Prawn::Document
 			column(0).width = 135
 			columns(1..6).width = 67.5
 			columns(0..6).style(font_style: :bold)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
 			row(1).style(border_bottom_width: 0.5, font_style: nil)
@@ -643,7 +656,7 @@ class ClosedSale < Prawn::Document
 			columns(0..3).style(font_style: :bold)
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 			row(1).style(border_bottom_width: 0.5, font_style: nil)
 		end
 	end
@@ -669,7 +682,7 @@ class ClosedSale < Prawn::Document
 		table(planting_data) do
 			columns(0..7).width = 67.5
 			columns(0..7).style(font_style: :bold)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
 			row(1).style(border_bottom_width: 0.5, font_style: nil)
@@ -681,14 +694,14 @@ class ClosedSale < Prawn::Document
 		table(extern_data) do
 			columns(0..3).width = 135
 			columns([1, 3]).style(font_style: :bold)
-			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
 			cells.padding = [1, 2.5]
 			cells.style(border_width: 0)
 		end
 	end
 
 	def additional_images
-		if @property_images && @property_images.any?
+		if @property_images && @property_images.count > 1
 			start_new_page
 			if @property_images[1]
 				bounding_box([0, 690], height: 330, width: 250) do
@@ -715,15 +728,5 @@ class ClosedSale < Prawn::Document
 			end
 		end
 	end
-end
-
-# misc. notes
-
-# the first page of the report is split into two columns using bounding boxes, each is 270 p wide
 
-##### tables ######
-# - 4 column layout [68, 67, 67, 68]
-# - 3 column tables can be used if needed [90, 90, 90]
-# - 2 column layout [135, 135]
-# - for dynamic layouts within an existing layout, pass colspan and content to data array like so: 
-# - {content: "double span", colspan: 2} => spans two columns with content
+end

data/lib/eval_report.rb

@@ -448,7 +448,7 @@ class EvalReport < Prawn::Document
 				cells.style(border_width: 0)
 				cells.padding = [1, 2.5]
 				row(0).style(align: :center, font_style: :bold, border_bottom_width: 0.5)
-				column(0).style(align: :right)
+				column(0).style(align: :center)
 			end
 
 			stroke_bounds
@@ -663,19 +663,58 @@ class EvalReport < Prawn::Document
 	end
 
 	def property_features # container method to create various tables
-		font_size 6
-		transaction_history
-		utilities
-		improvements
-		water_rights
-		water_distribution
+		font_size 7
+		stroke_bounds
+		if @sub[:transactions] && @sub[:transactions].any?
+			transaction_history
+			move_down 15
+			stroke_horizontal_rule
+			move_down 5
+		end
+
+		if @sub[:utilities] && @sub[:utilities].any?
+			utilities
+			move_down 15
+			stroke_horizontal_rule
+			move_down 5
+		end
+
+		if @sub[:improvements] && @sub[:improvements].any?
+			improvements
+			move_down 15
+			stroke_horizontal_rule
+			move_down 5
+		end
+
+		if @sub[:waterrights] && @sub[:waterrights].any?
+			water_rights
+			move_down 15
+			stroke_horizontal_rule
+			move_down 5
+		end
+
+		if @sub[:waterdistributions] && @sub[:waterdistributions].any?
+			water_distribution
+			move_down 15
+			stroke_horizontal_rule
+			move_down 5
+		end
 		
-		start_new_page
+		if @sub[:crops] && @sub[:crops].any?
+			crop_yield
+			move_down 15
+			stroke_horizontal_rule
+			move_down 5
+		end
 
-		crop_yield
-		perm_plantings
-		externalities
+		if @sub[:plantings] && @sub[:plantings].any?
+			perm_plantings
+			move_down 15
+			stroke_horizontal_rule
+			move_down 5
+		end
 
+		externalities
 		start_new_page
 		font_size 11
 	end
@@ -1052,231 +1091,197 @@ class EvalReport < Prawn::Document
 
 	# table methods for the property_features_method
 	def transaction_history
-		bounding_box([0, 700], height: 135, width: 540) do
-			transaction_history_data = [
-				[{content: "Transaction History", colspan: 4}],
-				["Historic Transaction Type", "Transaction Description", "Date", "Sale Price, List Price, or List Price"]
-			]
+		transaction_history_data = [
+			[{content: "Transaction History", colspan: 4}],
+			["Historic Transaction Type", "Transaction Description", "Date", "Sale Price, List Price, or List Price"]
+		]
 
-			transactions = @sub[:historyrecords]
+		transactions = @sub[:historyrecords]
 
-			if transactions # node could be nil
-				transactions.each do |t|
-					if t # array could be nil
-						transaction_history_data.push(
-							["#{t[:transType]}", "#{t[:transDescr]}", datemaker(t[:transDate]), moneymaker(t[:price], true)]
-						)
-					end
+		if transactions # node could be nil
+			transactions.each do |t|
+				if t # array could be nil
+					transaction_history_data.push(
+						["#{t[:transType]}", "#{t[:transDescr]}", datemaker(t[:transDate]), moneymaker(t[:price], true)]
+					)
 				end
 			end
+		end
 
-			table(transaction_history_data) do
-				columns(0..3).width = 135
-				columns(0..3).style(align: :right, font_style: :bold)
-				cells.padding = [1, 2.5]
-				cells.style(border_width: 0)
-				row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
-				row(1).style(border_bottom_width: 0.5, font_style: nil)
-			end
-			stroke_bounds
+		table(transaction_history_data) do
+			columns(0..3).width = 135
+			columns(0..3).style(align: :right, font_style: :bold)
+			cells.padding = [1, 2.5]
+			cells.style(border_width: 0)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
+			row(1).style(border_bottom_width: 0.5, font_style: nil)
 		end
 	end
 
 	def utilities
-		bounding_box([0, 565], height: 120, width: 540) do
-			utilities_data = [
-				[{content: "Description of Utilities", colspan: 4}],
-				["Utility Description", "Service Availability", "Service Provider", "Comments"]
-			]
+		utilities_data = [
+			[{content: "Description of Utilities", colspan: 4}],
+			["Utility Description", "Service Availability", "Service Provider", "Comments"]
+		]
 
-			utilities = @sub[:utilities]
-			if utilities # node could be nil
-				utilities.each do |u|
-					if u # array could be empty
-						utilities_data.push(
-							["#{u[:description]}", "#{u[:availability]}", "#{u[:provider]}", "#{u[:comments]}"]
-						)
-					end
+		utilities = @sub[:utilities]
+		if utilities # node could be nil
+			utilities.each do |u|
+				if u # array could be empty
+					utilities_data.push(
+						["#{u[:description]}", "#{u[:availability]}", "#{u[:provider]}", "#{u[:comments]}"]
+					)
 				end
 			end
+		end
 
-			table(utilities_data) do
-				columns(0..3).width = 135
-				columns(0..3).style(align: :right, font_style: :bold)
-				cells.padding = [1, 2.5]
-				cells.style(border_width: 0)
-				row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
-				row(1).style(border_bottom_width: 0.5, font_style: nil)
-			end
-			stroke_bounds
+		table(utilities_data) do
+			columns(0..3).width = 135
+			columns(0..3).style(align: :right, font_style: :bold)
+			cells.padding = [1, 2.5]
+			cells.style(border_width: 0)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
+			row(1).style(border_bottom_width: 0.5, font_style: nil)
 		end
-		# no new page
 	end
 
 	def improvements
-		bounding_box([0, 445], height: 220, width: 540) do
-
-			improvements_array = @sub[:improvements]			
-			
-			sorted_array = flip_improvements_array(improvements_array)
+		improvements_array = @sub[:improvements]			
+		
+		sorted_array = flip_improvements_array(improvements_array)
 
-			table(sorted_array) do
-				columns(0..7).width = 67.5
-				columns(1..7).style(font_style: :bold)
-				row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
-				cells.padding = [1, 2.5]
-				cells.style(border_width: 0, font_size: 6)
-				row(1).style(border_bottom_width: 0.5, font_style: nil)
-			end 
-			stroke_bounds
-		end
+		table(sorted_array) do
+			columns(0..7).width = 67.5
+			columns(1..7).style(font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
+			cells.padding = [1, 2.5]
+			cells.style(border_width: 0)
+			row(1).style(border_bottom_width: 0.5, font_style: nil)
+		end 
 		# no new page
 	end
 
 	def water_rights
-		bounding_box([0, 225], height: 115, width: 540) do
-
-			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_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"]
+		]
 
-			rights = @sub[:waterrights]
-			if rights # node could be nil
-				rights.each do |r|
-					if r # array could be empty
-						water_rights_data.push(
-							["#{r[:waterrightNum]}", "#{r[:waterRight]}", "#{r[:waterSrc]}", datemaker(r[:priorityDate]), "#{r[:purpose]}", "#{r[:numIrrAcres]}", "#{r[:annVolume]}"]
-						)
-					end
+		rights = @sub[:waterrights]
+		if rights # node could be nil
+			rights.each do |r|
+				if r # array could be empty
+					water_rights_data.push(
+						["#{r[:waterrightNum]}", "#{r[:waterRight]}", "#{r[:waterSrc]}", datemaker(r[:priorityDate]), "#{r[:purpose]}", "#{r[:numIrrAcres]}", "#{r[:annVolume]}"]
+					)
 				end
 			end
+		end
 
-			table(water_rights_data) do
-				columns(0..7).width = 67.5
-				columns(0..7).style(font_style: :bold)
-				row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
-				cells.padding = [1, 2.5]
-				cells.style(border_width: 0)
-				row(1).style(border_bottom_width: 0.5, font_style: nil)
-			end
-
-			stroke_bounds
+		table(water_rights_data) do
+			columns(0..7).width = 67.5
+			columns(0..7).style(font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
+			cells.padding = [1, 2.5]
+			cells.style(border_width: 0)
+			row(1).style(border_bottom_width: 0.5, font_style: nil)
 		end
 		# no new page
 	end
 
 	def water_distribution
-		bounding_box([0, 110], height: 110, width: 540) do
-
-			distribution_data = [
-				[{content: "Water Distribution System", colspan: 8}],
-				["Water Distrib. Equip.", "Manuf.", "Make/Brand", "Type", "Description", "Yr. Manufactured", "Remaining Ec. Life", "No. Acres Irrigated"]
-			]
+		distribution_data = [
+			[{content: "Water Distribution System", colspan: 8}],
+			["Water Distrib. Equip.", "Manuf.", "Make/Brand", "Type", "Description", "Yr. Manufactured", "Remaining Ec. Life", "No. Acres Irrigated"]
+		]
 
-			distributions = @sub[:waterdistributions]
+		distributions = @sub[:waterdistributions]
 
-			if distributions # node could be nil
-				distributions.each do |d|
-					if d # array could be empty
-						distribution_data.push(
-							["#{d[:waterdistrEq]}", "#{d[:manufacturer]}", "#{d[:brand]}", "#{d[:eqType]}", "#{d[:descr]}", "#{d[:yearManuf]}", "#{d[:remainingEcLife]}", "#{d[:irrAcres]}"]
-						)
-					end
+		if distributions # node could be nil
+			distributions.each do |d|
+				if d # array could be empty
+					distribution_data.push(
+						["#{d[:waterdistrEq]}", "#{d[:manufacturer]}", "#{d[:brand]}", "#{d[:eqType]}", "#{d[:descr]}", "#{d[:yearManuf]}", "#{d[:remainingEcLife]}", "#{d[:irrAcres]}"]
+					)
 				end
 			end
+		end
 
-			table(distribution_data) do
-				columns(0..7).width = 67.5
-				columns(0..7).style(font_style: :bold)
-				row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
-				cells.padding = [1, 2.5]
-				cells.style(border_width: 0)
-				row(1).style(border_bottom_width: 0.5, font_style: nil)
-			end
-
-			stroke_bounds
+		table(distribution_data) do
+			columns(0..7).width = 67.5
+			columns(0..7).style(font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
+			cells.padding = [1, 2.5]
+			cells.style(border_width: 0)
+			row(1).style(border_bottom_width: 0.5, font_style: nil)
 		end
 	end
 
 	def crop_yield
-		bounding_box([0, 700], height: 100, width: 540) do
-
-			crops = @sub[:crops]
+		crops = @sub[:crops]
 
-			crop_data = [
-				[{content: "Crop Yield Summary", colspan: 7}],
-				["Crop Year", "Commodity Identified", "Unit of Measure", "Average Yield", " ", " ", ", "]
-			]
+		crop_data = [
+			[{content: "Crop Yield Summary", colspan: 7}],
+			["Crop Year", "Commodity Identified", "Unit of Measure", "Average Yield", " ", " ", ", "]
+		]
 
-			if crops # node could be nil
-				crops.each do |c|
-					if c # array could be empty
-						crop_data.push(
-							["#{c[:year]}", "#{c[:commodity]}", "#{c[:unit]}", "#{c[:avgyield]}"]
-						)
-					end
+		if crops # node could be nil
+			crops.each do |c|
+				if c # array could be empty
+					crop_data.push(
+						["#{c[:year]}", "#{c[:commodity]}", "#{c[:unit]}", "#{c[:avgyield]}"]
+					)
 				end
 			end
+		end
 
-			table(crop_data) do
-				column(0).width = 135
-				columns(1..6).width = 67.5
-				columns(0..6).style(font_style: :bold)
-				row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
-				cells.padding = [1, 2.5]
-				cells.style(border_width: 0)
-				row(1).style(border_bottom_width: 0.5, font_style: nil)
-			end
-			stroke_bounds
+		table(crop_data) do
+			column(0).width = 135
+			columns(1..6).width = 67.5
+			columns(0..6).style(font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
+			cells.padding = [1, 2.5]
+			cells.style(border_width: 0)
+			row(1).style(border_bottom_width: 0.5, font_style: nil)
 		end
 	end
 
 	def perm_plantings
-		bounding_box([0, 600], height: 150, width: 540) do
-			planting_data = [
-				[{content: "Permanent Plantings", colspan: 8}],
-				["Planting", "Variety", "Ac. Type", "No. of Acres", "Average Age", "Plants/Acre", "Unit Description", "Average Yield"]
-			]
+		planting_data = [
+			[{content: "Permanent Plantings", colspan: 8}],
+			["Planting", "Variety", "Ac. Type", "No. of Acres", "Average Age", "Plants/Acre", "Unit Description", "Average Yield"]
+		]
 
-			plantings = @sub[:plantings]
+		plantings = @sub[:plantings]
 
-			if plantings # node could be nil
-				plantings.each do |p|
-					if p # array could be empty
-						planting_data.push(
-							["#{p[:planting]}", "#{p[:variety]}", "#{p[:acres]}", "#{p[:numacres]}", "#{p[:avgage]}", "#{p[:plantsacre]}", "#{p[:unitdescr1]}", "#{p[:avgproduction]}"]
-						)
-					end
+		if plantings # node could be nil
+			plantings.each do |p|
+				if p # array could be empty
+					planting_data.push(
+						["#{p[:planting]}", "#{p[:variety]}", "#{p[:acres]}", "#{p[:numacres]}", "#{p[:avgage]}", "#{p[:plantsacre]}", "#{p[:unitdescr1]}", "#{p[:avgproduction]}"]
+					)
 				end
 			end
+		end
 
-			table(planting_data) do
-				columns(0..7).width = 67.5
-				columns(0..7).style(font_style: :bold)
-				row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
-				cells.padding = [1, 2.5]
-				cells.style(border_width: 0)
-				row(1).style(border_bottom_width: 0.5, font_style: nil)
-			end
-			
-			stroke_bounds
+		table(planting_data) do
+			columns(0..7).width = 67.5
+			columns(0..7).style(font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', size: 11, font_style: :bold)
+			cells.padding = [1, 2.5]
+			cells.style(border_width: 0)
+			row(1).style(border_bottom_width: 0.5, font_style: nil)
 		end
 	end
 
 	def externalities
-		bounding_box([0, 450], height: 350, width: 540) do
-			
-			extern_data = ReportUtils.conditional_externs_array(@sub) # instance method to populate dynamic array
-			table(extern_data) do
-				columns(0..3).width = 135
-				columns([1, 3]).style(font_style: :bold)
-				row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
-				cells.padding = [1, 2.5]
-				cells.style(border_width: 0)
-			end
-
-			stroke_bounds
+		extern_data = ReportUtils.conditional_externs_array(@sub) # instance method to populate dynamic array
+		table(extern_data) do
+			columns(0..3).width = 135
+			columns([1, 3]).style(font_style: :bold)
+			row(0).style(align: :center, background_color: 'd7d7d7', font_size: 8, font_style: :bold)
+			cells.padding = [1, 2.5]
+			cells.style(border_width: 0)
 		end
 	end
 

data/spec/lib/eval_report_spec.rb

@@ -701,7 +701,7 @@ describe 'eval report class' do
 					water_distribution
 				end
 				page1 = PDF::Reader.new(StringIO.new(@pdf.render)).page(1).to_s
-				page2 = PDF::Reader.new(StringIO.new(@pdf.render)).page(2).to_s
+				page2 = PDF::Reader.new(StringIO.new(@pdf.render)).page(1).to_s
 				@water_distribution_content = page1 + page2
 			end
 

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ require 'appraisermetrics_report_service'
 require 'pdf-reader'
 require './spec/test_data/sampler'
 
+I18n.enforce_available_locales = false
+
 RSpec.configure do |config|
 
 end

data/spec/test_data/sampler.rb

@@ -6,7 +6,7 @@ class Sampler
   # generate a sample report quickly
   def self.test_closed_sale
     c = ClosedSale.new do
-      write_content(Sampler.get_comp2, Sampler.sample_closed_sale_images, nil) 
+      write_content(Sampler.get_comp2, Sampler.sample_closed_sale_images, Sampler.sample_logo) 
       render_file("closed_sale.pdf")
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appraisermetrics_report_service
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - StackPoint
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: '["A service to generate pdf reports"]'