From f35b14b6d06bfbe1d24abb5b752df06bcb690d24 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Thu, 2 Apr 2009 09:57:23 +0000
Subject: All the latest changes. None mentioned, none forgotten.

---
 server/xml/macros/B.2.2.4.2.xml | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

(limited to 'server/xml/macros/B.2.2.4.2.xml')

diff --git a/server/xml/macros/B.2.2.4.2.xml b/server/xml/macros/B.2.2.4.2.xml
index 4118b78..aaa3866 100644
--- a/server/xml/macros/B.2.2.4.2.xml
+++ b/server/xml/macros/B.2.2.4.2.xml
@@ -15,21 +15,19 @@
   <resume language="lua">
     out = ''
     if ( getValue('oct.right.missing') == '' or getValue('oct.left.missing') == '' )
-		then
-		  out = out .. 'Central nethindetykkelse:\n'
+    then
+      out = out .. 'Central nethinde konklusion:\n'
 
       if ( getValue('oct.right.missing') == '' )
       then
-        out = out .. 'OCT o.dxt ' .. getValue('oct.right.thickness') .. ' µm '
-		        .. getValue('oct.right.description') .. '.\n'
+        out = out .. 'OCT o.dxt ' .. getValue('oct.right.description') .. '.\n'
       end
 
       if ( getValue('oct.left.missing') == '' )
       then
-        out = out .. 'OCT o.sin ' .. getValue('oct.left.thickness') .. ' µm '
-            .. getValue('oct.left.description') .. '.\n'
+        out = out .. 'OCT o.sin ' .. getValue('oct.left.description') .. '.\n'
       end
-		end
+    end
 
     if ( getValue('oct.comments') ~= '' )
     then
@@ -81,15 +79,6 @@
     </map>
   </maps>
   <scripts>
-    <script language="lua" name="lt10000gt0">
-      value = string.gsub(value, ',', '.')
-      if(tonumber(value) &gt;= 0 and tonumber(value) &lt;= 10000)
-      then
-        return true
-      else
-        return false
-      end
-    </script>
     <script language="lua" name="right_eye">
       if ( value == 'mangler' )
       then
@@ -109,7 +98,7 @@
       return true
     </script>
   </scripts>
-  <window caption="OCT, m. konklusion (B.2.2.4.2)"
+  <window caption="OCT konklusion (B.2.2.4.2)"
           layout="vbox">
 
     <frame layout="hbox">
@@ -123,7 +112,7 @@
 
 	<frame name="right_eye_frame" caption="Højre øje" layout="hbox">
 	  <label caption="Tykkelse:"/>
-	  <lineedit name="oct.right.thickness" regexp="\d{1,5}" script="lt10000gt0" value=""/>
+	  <lineedit name="oct.right.thickness" value="" readonly="true"/>
 	  <label caption="µm"/>
 	  <combobox name="oct.right.description" type="select" value="">
 	    <item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
@@ -144,7 +133,7 @@
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="left_eye_frame" caption="Venstre øje" layout="hbox">
 	  <label caption="Tykkelse:"/>
-	  <lineedit name="oct.left.thickness" regexp="\d{1,5}" script="lt10000gt0" value=""/>
+	  <lineedit name="oct.left.thickness" value="" readonly="true"/>
 	  <label caption="µm"/>
 	  <combobox name="oct.left.description" type="select" value="">
 	    <item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
-- 
cgit v1.2.3