From de91c53b843e9c7779fabcdef67a716c08f3c890 Mon Sep 17 00:00:00 2001
From: senator <senator>
Date: Fri, 6 Nov 2009 11:27:47 +0000
Subject: all sf cyl grader macros now allow only sf filled in. templates
 updated

---
 server/xml/macros/cycloplegisk_refraktion-1.0.xml | 53 ++++++++++++-----------
 1 file changed, 28 insertions(+), 25 deletions(-)

(limited to 'server/xml/macros/cycloplegisk_refraktion-1.0.xml')

diff --git a/server/xml/macros/cycloplegisk_refraktion-1.0.xml b/server/xml/macros/cycloplegisk_refraktion-1.0.xml
index eaa333a..523aa18 100644
--- a/server/xml/macros/cycloplegisk_refraktion-1.0.xml
+++ b/server/xml/macros/cycloplegisk_refraktion-1.0.xml
@@ -1,32 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--
-    20081203: Bent Bisballe Nyeng
-    Feltnavnene ændret så de giver mening.
-  -->
-<!--
-    20090108: Bent Bisballe Nyeng
-    Højre/venstre byttet om.
-  -->
-<!--
-    20090202: Bent Bisballe Nyeng
-    'missing eye' tilføjet.
-  -->
 <macro name="cycloplegisk_refraktion" version="1.0">
   <resume language="lua">
     out = ''
-    out = out .. 'Cycloplegisk refraktion:\n'
     if ( getValue('cycloplegisk_refraktion.right.missing') == '' )
     then
-      out = out .. 'Højre øje: ' .. getValue('cycloplegisk_refraktion.right.sf')
-        .. ' sf, ' .. getValue('cycloplegisk_refraktion.right.cyl') .. ' x ' 
-        .. getValue('cycloplegisk_refraktion.right.grader') .. '\n'
+      out = out .. 'Cycloplegisk refraktion, o.dxt: ' .. getValue('cycloplegisk_refraktion.right.sf') .. ' sf'
+      if ( getValue('cycloplegisk_refraktion.right.cyl') ~= '' )
+      then
+        out = out .. ', ' .. getValue('cycloplegisk_refraktion.right.cyl') .. ' cyl'
+      end
+      if ( getValue('cycloplegisk_refraktion.right.grader') ~= '' )
+      then
+        out = out .. ', ' .. getValue('cycloplegisk_refraktion.right.grader') .. ' grader\n'
+      else
+        out = out .. '\n'
+      end
     end
 
     if ( getValue('cycloplegisk_refraktion.left.missing') == '' )
     then
-      out = out .. 'Venstre øje: ' .. getValue('cycloplegisk_refraktion.left.sf')
-        .. ' sf, ' .. getValue('cycloplegisk_refraktion.left.cyl') .. ' x '
-        .. getValue('cycloplegisk_refraktion.left.grader') .. '\n'
+      out = out .. 'Cycloplegisk refraktion, o.sin: ' .. getValue('cycloplegisk_refraktion.left.sf') .. ' sf'
+      if ( getValue('cycloplegisk_refraktion.left.cyl') ~= '' )
+      then
+        out = out .. ', ' .. getValue('cycloplegisk_refraktion.left.cyl') .. ' cyl'
+      end
+      if ( getValue('cycloplegisk_refraktion.left.grader') ~= '' )
+      then
+        out = out .. ', ' .. getValue('cycloplegisk_refraktion.left.grader') .. ' grader\n'
+      else
+        out = out .. '\n'
+      end
     end
 
     return out
@@ -92,7 +95,7 @@
     <script language="lua" name="lt10gt-15">
       if(value == '')
       then
-        return false
+        return true
       end
 
       value = string.gsub(value, ',', '.')
@@ -106,7 +109,7 @@
     <script language="lua" name="lt359gt0">
       if(value == '')
       then
-        return false
+        return true
       end
 
       value = string.gsub(value, ',', '.')
@@ -157,12 +160,12 @@
 	  <frame layout="vbox">
 	    <label caption="Cyl:"/>
 	    <lineedit name="cycloplegisk_refraktion.right.cyl" map="cycloplegisk_refraktion.right.cyl"
-		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+		      regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="Grader:"/>
 	    <lineedit name="cycloplegisk_refraktion.right.grader" map="cycloplegisk_refraktion.right.axis"
-		      regexp="[\d]+" script="lt359gt0" value=""/>
+		      regexp="|[\d]+" script="lt359gt0" value=""/>
 	  </frame>
 	</frame>
       </frame>
@@ -183,12 +186,12 @@
 	  <frame layout="vbox">
 	    <label caption="Cyl:"/>
 	    <lineedit name="cycloplegisk_refraktion.left.cyl" map="cycloplegisk_refraktion.left.cyl"
-		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+		      regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
 	  </frame>
 	  <frame layout="vbox">
 	    <label caption="Grader:"/>
 	    <lineedit name="cycloplegisk_refraktion.left.grader" map="cycloplegisk_refraktion.left.axis"
-		      regexp="[\d]+" script="lt359gt0" value=""/>
+		      regexp="|[\d]+" script="lt359gt0" value=""/>
 	  </frame>
 	</frame>
       </frame>
-- 
cgit v1.2.3