From 95549f54dcb24584ad7fbd467e47453a1ef56b85 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Thu, 26 Feb 2009 17:17:27 +0000
Subject: Modified journal output, to fit external parser needs.

---
 server/xml/macros/B.2.1.3.xml |  4 ++--
 server/xml/macros/B.2.2.1.xml | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'server')

diff --git a/server/xml/macros/B.2.1.3.xml b/server/xml/macros/B.2.1.3.xml
index df1483d..0093130 100644
--- a/server/xml/macros/B.2.1.3.xml
+++ b/server/xml/macros/B.2.1.3.xml
@@ -96,7 +96,7 @@ ${current_eye_disease}</resume>
 
 	  <frame layout="vbox">
 	    <label caption="Aktuelt øje:"/>
-	    <radiobuttons name="eye" value="." layout="hbox">
+	    <radiobuttons name="eye" value="HØJRE" layout="hbox">
 	      <radiobutton caption="o.dxt" value="HØJRE"/>
 	      <radiobutton caption="o.sin" value="VENSTRE"/>
 	    </radiobuttons>
@@ -105,7 +105,7 @@ ${current_eye_disease}</resume>
 
 	  <frame layout="vbox">
 	    <label caption="Observeret:"/>
-	    <altcombobox name="observeret" layout="vbox" value="mørk plet i synsfeltet">
+	    <altcombobox name="observeret" layout="vbox" value="SLØRET SYN">
 	      <item caption="Sløret syn" value="SLØRET SYN"/>
 	      <item caption="Mørk plet i synsfeltet" value="MØRK PLET I SYNSFELTET"/>
 	      <item caption="Metamorfopsier" value="METAMORFOPSIER"/>
diff --git a/server/xml/macros/B.2.2.1.xml b/server/xml/macros/B.2.2.1.xml
index f0445d7..019d00e 100644
--- a/server/xml/macros/B.2.2.1.xml
+++ b/server/xml/macros/B.2.2.1.xml
@@ -16,14 +16,18 @@
     out = ''
     if ( getValue('snellen.right.missing') == '' or getValue('snellen.left.missing') == '' )
     then
-      out = out ..'               Snellen ETDRS\n'
+      out = out .. 'Objektivt:\n'
+
       if ( getValue('snellen.right.missing') == '' )
       then
-        out = out..'Syn højre øje:   '..getValue('snellen.right')..'     '..getValue('etdrs.right')..'\n'
+        out = out .. 'VISUS O.DXT. ' .. getValue('snellen.right') .. '\n'
+        out = out .. 'ETDRS O.DXT. ' .. getValue('etdrs.right') .. '\n'
       end
+  
       if ( getValue('snellen.left.missing') == '' )
       then
-        out = out..'Syn venstre øje: '..getValue('snellen.left')..'     '..getValue('etdrs.left')..'\n'
+        out = out .. 'VISUS O.SIN. ' .. getValue('snellen.left') .. '\n'
+        out = out .. 'ETDRS O.SIN. ' .. getValue('etdrs.left') .. '\n'
       end
     end
     return out
-- 
cgit v1.2.3