Merge pull request #1551 from danielpgross/issue-1483

Issue #1483: Include pregnancy as option from 'new child' click
phenotips · Apr 14, 2015 · 881cb3a · 881cb3a
2 parents 405d269 + 7bd47cf
commit 881cb3a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/components/pedigree/resources/src/main/resources/pedigree/editor.css b/components/pedigree/resources/src/main/resources/pedigree/editor.css
@@ -694,19 +694,21 @@
   line-height: 24px;
 }
 .node-type-options .node-type-option.square {
-  line-height: 27px;
+  line-height: 28px;
 }
 .node-type-options .node-type-option.square span {
   display: inline-block;
-  width: 10px; height: 10px;
+  width: 12px; 
+  height: 12px;
   border: 1px solid black;
 }
 .node-type-options .node-type-option.diamond {
-  line-height: 24px;
+  line-height: 26px;
 }
 .node-type-options .node-type-option.diamond span {
   display: inline-block;
-  width: 7px; height: 7px;
+  width: 10px; 
+  height: 10px;
   border: 1px solid black;
   -webkit-transform: rotate(45deg);
   -moz-transform: rotate(45deg);
@@ -715,14 +717,25 @@
   transform: rotate(45deg);
 }
 .node-type-options .node-type-option.circle {
-  line-height: 24px;
+  line-height: 29px;
 }
 .node-type-options .node-type-option.circle span {
   display: inline-block;
-  width: 10px; height: 10px;
+  width: 12px; 
+  height: 12px;
   border-radius: 50%;
   border: 1px solid black;
 }
+.node-type-options .node-type-option.text-in-middle {
+  position: relative;
+}
+.node-type-options .node-type-option.text-in-middle strong {
+  font-weight: bold;
+  font-size: 8px;
+  position: absolute;
+  top: 8px; 
+  left: 10px;
+}
 .expand-arrow {
   cursor: pointer;
   font-size: 15px;

diff --git a/components/pedigree/resources/src/main/resources/pedigree/view/nodetypeSelectionBubble.js b/components/pedigree/resources/src/main/resources/pedigree/view/nodetypeSelectionBubble.js
@@ -39,6 +39,16 @@ var NodetypeSelectionBubble = Class.create({
             callback : "CreateChild",
             params: { parameters: {"gender": "U"} },
             inSiblingMode: true
+        }, {
+            key: "P",
+            type: "person",
+            label: "Pregnancy",
+            tip  : "Create a pregnancy",
+            symbol: "<span></span><strong>P</strong>",
+            cssclass: "diamond text-in-middle",
+            callback : "CreateChild",
+            params: { "parameters": {"lifeStatus": "unborn"} },
+            inSiblingMode: true
         }, {
             key: "T",
             type: "person",