From b1252886b266b0190db9cae453e0f7b203914a06 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Mon, 27 Apr 2009 08:53:57 +0000
Subject: 'Andet' added.

---
 server/xml/macros/B.2.2.4.2.xml | 47 +++++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/server/xml/macros/B.2.2.4.2.xml b/server/xml/macros/B.2.2.4.2.xml
index aaa3866..8acdf82 100644
--- a/server/xml/macros/B.2.2.4.2.xml
+++ b/server/xml/macros/B.2.2.4.2.xml
@@ -2,14 +2,15 @@
 <!--
     20081204: Bent Bisballe Nyeng
     Feltnavnene ændret så de giver mening.
-  -->
-<!--
+
     20090108: Bent Bisballe Nyeng
     Højre/venstre byttet om.
-  -->
-<!--
+
     20090402: Bent Bisballe Nyeng
     'missing eye' tilføjet.
+
+    20090427: Bent Bisballe Nyeng
+    'andet' mulighed tilfoejet til combo (altcombo).
   -->
 <macro name="B.2.2.4.2" version="1.0">
   <resume language="lua">
@@ -111,17 +112,26 @@
 		  truevalue="mangler" falsevalue="" value=""/>
 
 	<frame name="right_eye_frame" caption="Højre øje" layout="hbox">
-	  <label caption="Tykkelse:"/>
-	  <lineedit name="oct.right.thickness" value="" readonly="true"/>
-	  <label caption="µm"/>
-	  <combobox name="oct.right.description" type="select" value="">
+	  <frame layout="vbox">
+	    <frame layout="hbox">
+	      <label caption="Tykkelse:"/>
+	      <lineedit name="oct.right.thickness" value="" readonly="true"/>
+	      <label caption="µm"/>
+	    </frame>
+	    <label caption=""/>
+	  </frame>
+	  <altcombobox name="oct.right.description" type="select" value="" layout="vbox">
 	    <item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
 	    <item caption="Serøs amotio" value="serøs amotio"/>
 	    <item caption="Cystoidt makulært ødem" value="cystoidt makulært ødem"/>
 	    <item caption="Subretinal udfyldning" value="subretinal udfyldning"/>
 	    <item caption="Retinal traktion" value="retinal traktion"/>
 	    <item caption="Normal" value="normal"/> 
-	  </combobox>
+	    <altitem caption="Andet" innerwidget="octandetr" value="andet" layout="hbox"> 
+	      <label caption="Andet:"/>
+	      <lineedit name="octandetr"/>
+	    </altitem>
+	  </altcombobox>
 	</frame>
       </frame>
 
@@ -132,17 +142,26 @@
 		  map="missing_eye_left_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="left_eye_frame" caption="Venstre øje" layout="hbox">
-	  <label caption="Tykkelse:"/>
-	  <lineedit name="oct.left.thickness" value="" readonly="true"/>
-	  <label caption="µm"/>
-	  <combobox name="oct.left.description" type="select" value="">
+	  <frame layout="vbox">
+	    <frame layout="hbox">
+	      <label caption="Tykkelse:"/>
+	      <lineedit name="oct.left.thickness" value="" readonly="true"/>
+	      <label caption="µm"/>
+	    </frame>
+	    <label caption=""/>
+	  </frame>
+	  <altcombobox name="oct.left.description" type="select" value="" layout="vbox">
 	    <item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
 	    <item caption="Serøs amotio" value="serøs amotio"/>
 	    <item caption="Cystoidt makulært ødem" value="cystoidt makulært ødem"/>
 	    <item caption="Subretinal udfyldning" value="subretinal udfyldning"/>
 	    <item caption="Retinal traktion" value="retinal traktion"/>
 	    <item caption="Normal" value="normal"/> 
-	  </combobox>
+	    <altitem caption="Andet" innerwidget="octandetl" value="andet" layout="hbox"> 
+	      <label caption="Andet:"/>
+	      <lineedit name="octandetl"/>
+	    </altitem>
+	  </altcombobox>
 	</frame>
 	
       </frame>
-- 
cgit v1.2.3