All the latest changes. None mentioned, none forgotten.

1 files changed, 28 insertions, 18 deletions

diff --git a/server/xml/macros/B.2.5.xml b/server/xml/macros/B.2.5.xml
index 8509dfe..fbbdef7 100644
--- a/server/xml/macros/B.2.5.xml
+++ b/server/xml/macros/B.2.5.xml
@@ -1,7 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <macro name="B.2.5" version="1.0">
-  <resume>90-D undersøgelse:
-Der findes ingen randhæmorrhagier eller exsudater.</resume>
+  <resume language="lua">
+    out = '90-D undersøgelse:\nDer findes '
+    if(getValue('fundus.randh') == '' and getValue('fundus.exsud') == '')
+    then
+      out = out .. 'ingen randhæmorrhagier eller exsudater'
+    else
+      if(getValue('fundus.randh') ~= '' and getValue('fundus.exsud') ~= '')
+      then
+        out = out .. 'randhæmorrhagier og exsudater'
+      else
+        if(getValue('fundus.randh') ~= '')
+        then
+          out = out .. 'randhæmorrhagier'
+        end
+        if(getValue('fundus.exsud') ~= '')
+        then
+          out = out .. 'exsudater'
+        end
+      end
+    end
+    out = out .. '.\n'
+    return out
+  </resume>
   <queries>
   </queries>
   <maps>
@@ -11,28 +32,17 @@ Der findes ingen randhæmorrhagier eller exsudater.</resume>
   <window caption="Vurdering af fundus (B.2.5)"
           layout="vbox">
 
-    <combobox>
+    <combobox name="fundus.source" value="">
       <item caption="Fundus foto" value="Fundus foto"/>
       <item caption="90-D linse undersøgelse" value="90-D linse undersøgelse"/>
     </combobox>
 
     <label caption="viser"/>
 
-    <checkbox caption="Randhæmorrhagier" truevalue="Randhæmorrhagier" falsevalue="" value=""/>
-    <checkbox caption="Exsudater" truevalue="Exsudater" falsevalue="" value=""/>
-
-<!--
-To felter
-I en drop down menu vælges mellem to alternativer:
-”Fundus foto viser” (default)      << source 
-”90-D linse undersøgelse viser”
-
-I en anden drop down menu vælges mellem fire alternativer:
-”Ingen randhæmorrhagier eller exsudater” << result
-”Randhæmorrhagier”
-”Exsudater”
-”Randhæmorrhagier og exsudater”
--->
+    <checkbox name="fundus.randh" caption="Randhæmorrhagier"
+	      truevalue="Randhæmorrhagier" falsevalue="" value=""/>
+    <checkbox name="fundus.exsud" caption="Exsudater"
+	      truevalue="Exsudater" falsevalue="" value=""/>
 
     <!-- Knapper -->
     <frame layout="hbox">