[mhk] r1077 committed - Tree colors and info updated @ mhk_families

[codesite...@google.com]

Revision: 1077
Author: tbc...@gmail.com
Date: Sat Jun 1 15:07:47 2013
Log: Tree colors and info updated @ mhk_families
http://code.google.com/p/mhk/source/detail?r=1077

Modified:
/branches/mhk_families/idb/etc/template/new/rperson_family.vm

=======================================
--- /branches/mhk_families/idb/etc/template/new/rperson_family.vm Tue May
28 09:08:43 2013
+++ /branches/mhk_families/idb/etc/template/new/rperson_family.vm Sat Jun
1 15:07:47 2013
@@ -33,6 +33,7 @@
<link type="text/css" href="/mhk/stylesheets/pralls.css" rel="stylesheet"
/>
<script type="text/javascript"
src="/mhk/scripts/autoshape-min.js"></script>
<script language="javascript" type="text/javascript"
src="/mhk/scripts/familytree.js"></script>
+
<script type="text/javascript"</script>
window['drawPrallTree'] = function() {
var ftree = new FamilyTreeJS.FamilyTree();
@@ -66,13 +67,13 @@
if("${person.getLevel()}"==max_level){
##alert("ADD "+ "${person.getId()}");
#if($person.getSex()=="M" || $person.getSex()=="m")
- nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(192,219,243)'}, line: {color:'rgb(100,100,100)'} }});
+ nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(192,219,243)'}, line: {color:'rgb(100,100,100)' }}});
##alert("ADD MALE "+ "${person.getId()}"+" "+"${person.getSex()}");
#elseif($person.getSex()=="F" || $person.getSex()=="f")
- nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(255,212,212)'}, line: {color:'rgb(100,100,100)'} }});
+ nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(255,212,212)'}, line: {color:'rgb(100,100,100)' }}});
##alert("ADD FEMALE "+ "${person.getId()}"+" "+"${person.getSex()}");
#else
- nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(0,0,0)'}, line: {color:'rgb(100,100,100)'} }});
+ nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(0,0,0)'}, line: {color:'rgb(100,100,100)' }}});
##alert("ADD N/A "+ "${person.getId()}"+" "+"${person.getSex()}");
#end
hash["${person.getId()}"]=i;
@@ -86,11 +87,11 @@
if(!hash.hasOwnProperty("${person.getId()}")){
##alert("ADD2 "+ "${person.getId()}" + "
LEVEL="+"${person.getLevel()}");
#if($person.getSex()=="M" || $person.getSex()=="m")
- nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(192,219,243)'}, line: {color:'rgb(100,100,100)'} }});
+ nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(192,219,243)'}, line: {color:'rgb(100,100,100)'}}});
#elseif($person.getSex()=="F" || $person.getSex()=="f")
- nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(255,212,212)'}, line: {color:'rgb(100,100,100)'} }});
+ nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(255,212,212)'}, line: {color:'rgb(100,100,100)'}}});
#else
- nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(0,0,0)'}, line: {color:'rgb(100,100,100)'} }});
+ nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(0,0,0)'}, line: {color:'rgb(100,100,100)'}}});
#end
hash["${person.getId()}"]=i;
i++;
@@ -103,11 +104,23 @@
if(!hash.hasOwnProperty("${family.getChild()}")){
##alert("ADDC "+"${family.getChild()}");
#if($family.getFather()!="" && $family.getMother()!="")
- nodes[i] =
nodes[hash[father]].birth("${family.getChildName()}",{partner:nodes[hash[mother]]});
+ #if($family.getChildSex()=="F" || $family.getChildSex()=="f")
+ nodes[i] =
nodes[hash[father]].birth("${family.getChildName()}",{partner:nodes[hash[mother]],blurb:'Father: '+"${family.getFatherName()}"+'\n
Mother: '+"${family.getMotherName()}",
config:{node:{background:'rgb(255,212,212)'}}});
+ #else
+ nodes[i] =
nodes[hash[father]].birth("${family.getChildName()}",{partner:nodes[hash[mother]],blurb:'Father: '+"${family.getFatherName()}"+'\n
Mother: '+"${family.getMotherName()}",
config:{node:{background:'rgb(192,219,243)'}}});
+ #end
#elseif(!$family.getFather() && $family.getMother()!="")
- nodes[i] = nodes[hash[mother]].birth("${family.getChildName()}");
+ #if($family.getChildSex()=="F" || $family.getChildSex()=="f")
+ nodes[i] =
nodes[hash[mother]].birth("${family.getChildName()}",{blurb:'Mother: '+"${family.getMotherName()}",
config:{node:{background:'rgb(255,212,212)'}}});
+ #else
+ nodes[i] =
nodes[hash[mother]].birth("${family.getChildName()}",{blurb:'Mother: '+"${family.getMotherName()}",
config:{node:{background:'rgb(192,219,243)'}}});
+ #end
#elseif($family.getFather()!="" && !$family.getMother())
- nodes[i] = nodes[hash[father]].birth("${family.getChildName()}");
+ #if($family.getChildSex()=="F" || $family.getChildSex()=="f")
+ nodes[i] =
nodes[hash[father]].birth("${family.getChildName()}",{blurb:'Father: '+"${family.getFatherName()}",
config:{node:{background:'rgb(255,212,212)'}}});
+ #else
+ nodes[i] =
nodes[hash[father]].birth("${family.getChildName()}",{blurb:'Father: '+"${family.getFatherName()}",
config:{node:{background:'rgb(192,219,243)'}}});
+ #end
#end
hash["${family.getChild()}"]=i;
i++;