New macros

1 files changed, 119 insertions, 27 deletions

diff --git a/server/xml/macros/B.2.2.4.2.xml b/server/xml/macros/B.2.2.4.2.xml
index 1de45ea..3980234 100644
--- a/server/xml/macros/B.2.2.4.2.xml
+++ b/server/xml/macros/B.2.2.4.2.xml
@@ -7,12 +7,73 @@
     20090108: Bent Bisballe Nyeng
     Højre/venstre byttet om.
   -->
+<!--
+    20090402: Bent Bisballe Nyeng
+    'missing eye' tilføjet.
+  -->
 <macro name="B.2.2.4.2" version="1.0">
-  <resume>Central nethindetykkelse, højre: ${oct.right.thickness} µm, ${oct.right.description}.
-Central nethindetykkelse, venstre: ${oct.left.thickness} µm, ${oct.left.description}.</resume>
+  <resume language="lua">
+    out = ''
+    if ( getValue('oct.right.missing') == '' )
+    then
+      out = out .. 'Central nethindetykkelse, højre: ' .. getValue('oct.right.thickness')
+            .. ' µm, ' .. getValue('oct.right.description') .. '.\n'
+    end
+
+    if ( getValue('oct.left.missing') == '' )
+    then
+      out = out .. 'Central nethindetykkelse, venstre: ' .. getValue('oct.left.thickness') 
+          .. ' µm, ' .. getValue('oct.left.description') .. '.\n'
+    end
+
+    if ( getValue('oct.comments') ~= '' )
+    then
+      out = out .. getValue('oct.comments') .. '\n'
+    end
+
+    return out
+  </resume>
   <queries>
+    <query service="pracro" class="missing_eye_right" ttl="1000000"/>
+    <query service="pracro" class="missing_eye_left" ttl="1000000"/>
   </queries>
   <maps>
+    <map name="missing_eye_right_map">
+      value = 0
+      timestamp = 0
+      source = 'pracro'
+
+      if( missing_eye_right )
+      then
+        if( missing_eye_right.value and missing_eye_right.value == '' )
+        then
+          value = ''
+          timestamp = missing_eye_right.timestamp
+        else
+          value = 'mangler'
+          timestamp = missing_eye_right.timestamp
+        end
+      end
+      return value, timestamp, source
+    </map>
+    <map name="missing_eye_left_map">
+      value = 0
+      timestamp = 0
+      source = 'pracro'
+      
+      if( missing_eye_left )
+      then
+        if( missing_eye_left.value and missing_eye_left.value == '' )
+        then
+          value = ''
+          timestamp = missing_eye_left.timestamp
+        else
+          value = 'mangler'
+          timestamp = missing_eye_left.timestamp
+        end
+      end
+      return value, timestamp, source
+    </map>
   </maps>
   <scripts>
     <script language="lua" name="lt10000gt0">
@@ -24,6 +85,24 @@ Central nethindetykkelse, venstre: ${oct.left.thickness} µm, ${oct.left.descrip
         return false
       end
     </script>
+    <script language="lua" name="right_eye">
+      if ( value == 'mangler' )
+      then
+        disable('right_eye_frame')
+      else
+        enable('right_eye_frame')
+      end
+      return true
+    </script>
+    <script language="lua" name="left_eye">
+      if ( value == 'mangler' )
+      then
+        disable('left_eye_frame')
+      else
+        enable('left_eye_frame')
+      end
+      return true
+    </script>
   </scripts>
   <window caption="OCT, m. konklusion (B.2.2.4.2)"
           layout="vbox">
@@ -31,35 +110,48 @@ Central nethindetykkelse, venstre: ${oct.left.thickness} µm, ${oct.left.descrip
     <frame layout="hbox">
       
       <!-- Højre øje -->
-      <frame caption="Højre øje" layout="hbox">
-	<label caption="Tykkelse:"/>
-	<lineedit name="oct.right.thickness" regexp="\d{1,5}" script="lt10000gt0" value=""/>
-	<label caption="µm"/>
-	<combobox name="oct.right.description" type="select" value="">
-	  <item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
-	  <item caption="Serøs amotio" value="serøs amotio"/>
-	  <item caption="Cystoidt makulært ødem" value="cystoidt makulært ødem"/>
-	  <item caption="Subretinal udfyldning" value="subretinal udfyldning"/>
-	  <item caption="Retinal traktion" value="retinal traktion"/>
-	  <item caption="Normal" value="normal"/> 
-	</combobox>
+      <frame layout="vbox">
+	<checkbox caption="Der kan ikke måles på højre øje"
+		  name="oct.right.missing" script="right_eye"
+		  map="missing_eye_right_map"
+		  truevalue="mangler" falsevalue="" value=""/>
+
+	<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=""/>
+	  <label caption="µm"/>
+	  <combobox name="oct.right.description" type="select" value="">
+	    <item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
+	    <item caption="Serøs amotio" value="serøs amotio"/>
+	    <item caption="Cystoidt makulært ødem" value="cystoidt makulært ødem"/>
+	    <item caption="Subretinal udfyldning" value="subretinal udfyldning"/>
+	    <item caption="Retinal traktion" value="retinal traktion"/>
+	    <item caption="Normal" value="normal"/> 
+	  </combobox>
+	</frame>
       </frame>
 
       <!-- Venstre øje -->
-      <frame caption="Venstre øje" layout="hbox">
-	<label caption="Tykkelse:"/>
-	<lineedit name="oct.left.thickness" regexp="\d{1,5}" script="lt10000gt0" value=""/>
-	<label caption="µm"/>
-	<combobox name="oct.left.description" type="select" value="">
-	  <item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
-	  <item caption="Serøs amotio" value="serøs amotio"/>
-	  <item caption="Cystoidt makulært ødem" value="cystoidt makulært ødem"/>
-	  <item caption="Subretinal udfyldning" value="subretinal udfyldning"/>
-	  <item caption="Retinal traktion" value="retinal traktion"/>
-	  <item caption="Normal" value="normal"/> 
-	</combobox>
+      <frame layout="vbox">
+	<checkbox caption="Der kan ikke måles på venstre øje"
+		  name="oct.left.missing" script="left_eye"
+		  map="missing_eye_left_map"
+		  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=""/>
+	  <label caption="µm"/>
+	  <combobox name="oct.left.description" type="select" value="">
+	    <item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
+	    <item caption="Serøs amotio" value="serøs amotio"/>
+	    <item caption="Cystoidt makulært ødem" value="cystoidt makulært ødem"/>
+	    <item caption="Subretinal udfyldning" value="subretinal udfyldning"/>
+	    <item caption="Retinal traktion" value="retinal traktion"/>
+	    <item caption="Normal" value="normal"/> 
+	  </combobox>
+	</frame>
+	
       </frame>
-      
     </frame>
 
     <frame layout="vbox">