From 981abee9436f7cfd232078e7505db126795e4f35 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Fri, 20 Mar 2009 09:39:56 +0000
Subject: Macro changes...

---
 server/xml/macros/B.1.2.xml | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'server/xml/macros/B.1.2.xml')

diff --git a/server/xml/macros/B.1.2.xml b/server/xml/macros/B.1.2.xml
index 20463e3..2dd3643 100644
--- a/server/xml/macros/B.1.2.xml
+++ b/server/xml/macros/B.1.2.xml
@@ -8,6 +8,10 @@
     Alt tekst ændret.
     Layout af multilist input er ændret så det er liniebaseret.
   -->
+<!--
+    20090319: Bent Bisballe Nyeng
+    Øje ændret til combobox istedet for radiobuttons.
+  -->
 <macro name="B.1.2" version="1.0">
   <resume>Medicin:
 ${medicin}</resume>
@@ -32,7 +36,7 @@ ${medicin}</resume>
 		
 		<metawidget name="medicin_list_entry" layout="hbox" format="${prep} x ${dosis}${eye}">
 		  <frame layout="vbox">
-		    <label caption="Præparat:"/>
+		    <label caption="Præparat: ex. 'Primcillin 250 mg (tabl.)'"/>
 		    <dbwidget name="prep" driver="QPSQL" server="sensei.j.auh.dk" user="lmsread" database="lms"
 			      select="drugname, form, strength"
 			      from="package"
@@ -47,20 +51,27 @@ ${medicin}</resume>
 		  </frame>
 
 		  <frame layout="vbox">
-		    <label caption="Dosis:" />
-		    <lineedit name="dosis" width="75"/>
+		    <label caption="Dosis: ex. '2 tbl. dagl.'" />
+		    <lineedit name="dosis" width="75" value="" regexp=".+"/>
+		  </frame>
+
+		  <frame layout="vbox">
+		    <label caption=""/>
+		    <label caption=" - "/>
 		  </frame>
 
 		  <frame layout="vbox">
 		    <label caption="Øje:"/>
-		    <radiobuttons name="eye" value="" layout="hbox">
-		      <radiobutton caption="Ingen" value=""/>
-		      <radiobutton caption="o.dxt" value=" o.dxt"/>
-		      <radiobutton caption="o.sin" value=" o.sin"/>
-		      <radiobutton caption="o.u" value=" o.u"/>
-		    </radiobuttons>
+		    <combobox name="eye" value="">
+		      <item caption="Ingen" value=""/>
+		      <item caption="o.dxt" value=" o.dxt"/>
+		      <item caption="o.sin" value=" o.sin"/>
+		      <item caption="o.u" value=" o.u"/>
+		    </combobox>
 		  </frame>
 
+		  <spacer />
+
 		</metawidget>
 	      </multilist>
 	    </frame>
-- 
cgit v1.2.3