book: add more types to cv report

Signed-off-by: Matthias Rabe <[email protected]>

Author: Matthias Rabe

lib/ged_parse.inc.rb

@@ -108,6 +108,17 @@ def get_details(tag, details= @details, i= 0, list= [])
 			return list
 		end
 
+		def get_details_for_tags(tag)
+			list= []
+			details.each do |detail|
+				if tag.include?(detail[:field])
+					list << detail
+				end
+			end
+
+			return list
+		end
+
 		def get_cached_detail(sym, tag)
 			if @cached_details[sym].nil?
 				t= get_detail(tag)

reports/book.inc.rb

@@ -312,31 +312,36 @@ def t2(f)
 end
 
 def report_person_print_cv(ged, indi)
-	es= indi.get_details("EVEN")
+	es= indi.get_details_for_tags(["CHR", "BLES", "CONF", "EVEN", "EDUC", "OCCU"])
 	if es.length > 0
-		$params[:ofile].insertSubSubSection("Lebenslauf")
-		$params[:ofile].print "\\ThinHRule \\vspace{2mm}\n"
-
-	def t1(a, b, c, d= nil, e= nil, f= nil, g= nil, src_ids= [])
-		s= []
-		s += ["\\mbox{", b, h(c), "}"] if c.to_s != ""
-		s += ["\\mbox{", d, h(e), "}"] if e.to_s != ""
-		s += ["\\mbox{", f, h(g), "}"] if g.to_s != ""
-
-	end
+		$params[:ofile].insertSubSubSection("Werdegang")
+		$params[:ofile].print "\\ThinHRule \\vspace{2mm}\n\n"
 
 		$params[:ofile].print "\\begin{tabular}{p{6em} p{11em} p{\\textwidth-21em}}\n"
 
-		es.each {|e|
+		es.each_with_index {|e, i|
 			date, type, text = "", "", e[:value].to_s
+
+			if i>0 && i%3 == 0
+				$params[:ofile].print "\\end{tabular}\n\n"
+				$params[:ofile].print "\\begin{tabular}{p{6em} p{11em} p{\\textwidth-21em}}\n"
+			end
+
 			e[:children].each {|c|
 				case c[:field]
-				when "EVEN_DATE"	then	date = c[:value]
-				when "EVEN_TYPE"	then	type = c[:value]
-				when "EVEN_PLAC"	then	text += " in #{c[:value]}"
+				when "#{e[:field]}_DATE"	then	date = c[:value]
+				when "#{e[:field]}_TYPE"	then	type = c[:value]
+				when "#{e[:field]}_PLAC"	then	text += " in #{c[:value]}"
 				end
 			}
 
+			if ["CHR", "BLES", "CONF"].include? e[:field]
+				text = type + " " + text if type != ""
+				type = "Taufe"		if e[:field] == "CHR"
+				type = "Segnung"	if e[:field] == "BLES"
+				type = "Konfirmation"	if e[:field] == "CONF"
+			end
+
 			$params[:ofile].print "#{h(date)} & #{h(type)} & #{h(text)} \\\\\n"
 		}