From 95c00cd52ef1ec1c18cff7393bfde435cfc0b447 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Fri, 3 Jul 2009 13:53:34 +0000
Subject: Removed fieldnames data from initdb file.

---
 server/xml/macros/B.0.1.xml     | 2 +-
 server/xml/macros/B.2.2.4.2.xml | 8 ++++----
 server/xml/macros/B.2.2.7.xml   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'server/xml/macros')

diff --git a/server/xml/macros/B.0.1.xml b/server/xml/macros/B.0.1.xml
index fcaf010..3ef9572 100644
--- a/server/xml/macros/B.0.1.xml
+++ b/server/xml/macros/B.0.1.xml
@@ -8,7 +8,7 @@
   -->
 <macro name="B.0.1" version="1.0">
   <resume store_in_journal="true">
-    Henvist af ${referral.doctor} til forundersøgelse under diagnosen: ${referral.diagnose}
+    Henvist fra øjenlæge ${referral.doctor} til forundersøgelse for ${referral.diagnose}
   </resume>
   <queries>
     <query service="pentominos" class="referral" ttl="1000000"/>
diff --git a/server/xml/macros/B.2.2.4.2.xml b/server/xml/macros/B.2.2.4.2.xml
index 8acdf82..7784a3b 100644
--- a/server/xml/macros/B.2.2.4.2.xml
+++ b/server/xml/macros/B.2.2.4.2.xml
@@ -120,7 +120,7 @@
 	    </frame>
 	    <label caption=""/>
 	  </frame>
-	  <altcombobox name="oct.right.description" type="select" value="" layout="vbox">
+	  <altcombobox name="oct.right.description" type="select" value="normal" 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"/>
@@ -129,7 +129,7 @@
 	    <item caption="Normal" value="normal"/> 
 	    <altitem caption="Andet" innerwidget="octandetr" value="andet" layout="hbox"> 
 	      <label caption="Andet:"/>
-	      <lineedit name="octandetr"/>
+	      <lineedit name="octandetr" value="" regexp=".+"/>
 	    </altitem>
 	  </altcombobox>
 	</frame>
@@ -150,7 +150,7 @@
 	    </frame>
 	    <label caption=""/>
 	  </frame>
-	  <altcombobox name="oct.left.description" type="select" value="" layout="vbox">
+	  <altcombobox name="oct.left.description" type="select" value="normal" 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"/>
@@ -159,7 +159,7 @@
 	    <item caption="Normal" value="normal"/> 
 	    <altitem caption="Andet" innerwidget="octandetl" value="andet" layout="hbox"> 
 	      <label caption="Andet:"/>
-	      <lineedit name="octandetl"/>
+	      <lineedit name="octandetl" value="" regexp=".+"/>
 	    </altitem>
 	  </altcombobox>
 	</frame>
diff --git a/server/xml/macros/B.2.2.7.xml b/server/xml/macros/B.2.2.7.xml
index e3eed24..afd3b24 100644
--- a/server/xml/macros/B.2.2.7.xml
+++ b/server/xml/macros/B.2.2.7.xml
@@ -14,7 +14,7 @@
   -->
 <macro name="B.2.2.7" version="1.0">
   <resume language="lua">
-    out = ''
+    out = '90D linse:'
 
     if ( getValue('90D_lens.right.missing') == '' and getValue('90D_lens.left.missing') == '' )
     then
-- 
cgit v1.2.3