From e403363cd666c783d2d750b12c6f5ac79da2faa3 Mon Sep 17 00:00:00 2001
From: senator <senator>
Date: Fri, 14 Aug 2009 08:05:02 +0000
Subject: Resumess now working

---
 server/xml/macros/boelgefront-1.0.xml |  2 +-
 server/xml/macros/topografi-1.0.xml   | 31 +++++++++++++++++++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)

(limited to 'server')

diff --git a/server/xml/macros/boelgefront-1.0.xml b/server/xml/macros/boelgefront-1.0.xml
index 80570de..f198167 100644
--- a/server/xml/macros/boelgefront-1.0.xml
+++ b/server/xml/macros/boelgefront-1.0.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <macro name="boelgefront" version="1.0">
-  <resume language="pracro"></resume>
+  <resume language="pracro">Bølgefront: ${boelgefront}</resume>
   <queries>
   </queries>
   <maps>
diff --git a/server/xml/macros/topografi-1.0.xml b/server/xml/macros/topografi-1.0.xml
index 5c1ac5d..545128f 100644
--- a/server/xml/macros/topografi-1.0.xml
+++ b/server/xml/macros/topografi-1.0.xml
@@ -1,6 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <macro name="topografi" version="1.0">
-  <resume language="pracro"></resume>
+  <resume language="lua">
+    out = ''
+    if ( getValue('topografi.right.missing') == '' or getValue('topografi.left.missing') == '' )
+    then
+      out = out .. 'Topografi: ' .. getValue('topografi.method') .. '\n'
+    end
+
+    if ( getValue('topografi.right.missing') == '' )
+    then
+      out = out .. 'Højre øje: ' .. getValue('topografi.right.judgement') .. '\n'
+    end
+
+    if ( getValue('topografi.left.missing') == '' )
+    then
+      out = out .. 'Venstre øje: ' .. getValue('topografi.left.judgement') .. '\n'
+    end
+
+    return out
+  </resume>
   <queries>
   </queries>
   <maps>
@@ -65,7 +83,8 @@
   <widgets caption="Topografi"
           layout="vbox">
 
-    <altcombobox name="topografi" value="Atlas" layout="vbox">
+    <label caption="Metode:"/>
+    <altcombobox name="topografi.method" value="Atlas" layout="vbox">
       <item caption="Atlas" value="Atlas"/>
       <item caption="Pentacam" value="Pentacam"/>
       <item caption="Atlas og Pentacam" value="Atlas og Pentacam"/>
@@ -93,10 +112,10 @@
 	      <item caption="Regelmæssig astigmatisme" value="Regelmæssig astigmatisme"/>
 	      <item caption="Uregelmæssig astigmatisme" value="Uregelmæssig astigmatisme"/>
 	      <item caption="Keratoconus" value="Keratoconus"/>
-	      <altitem caption="Andet" value="andet" innerwidget="topografi_right_andet">
+	      <altitem caption="Andet" value="andet" innerwidget="topografi.right.andet">
 		<frame layout="hbox">
 		  <label caption="Andet:"/>
-		  <lineedit name="topografi_right_andet"/>
+		  <lineedit name="topografi.right.andet"/>
 		</frame>
 	      </altitem>
 	    </altcombobox>
@@ -119,10 +138,10 @@
 	      <item caption="Regelmæssig astigmatisme" value="Regelmæssig astigmatisme"/>
 	      <item caption="Uregelmæssig astigmatisme" value="Uregelmæssig astigmatisme"/>
 	      <item caption="Keratoconus" value="Keratoconus"/>
-	      <altitem caption="Andet" value="andet" innerwidget="topografi_left_andet">
+	      <altitem caption="Andet" value="andet" innerwidget="topografi.left.andet">
 		<frame layout="hbox">
 		  <label caption="Andet:"/>
-		  <lineedit name="topografi_left_andet"/>
+		  <lineedit name="topografi.left.andet"/>
 		</frame>
 	      </altitem>
 	    </altcombobox>
-- 
cgit v1.2.3