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.1.4.xml     |   4 +-
 server/xml/macros/B.2.1.3.xml   |  12 +--
 server/xml/macros/B.2.10.4.xml  |  23 +++--
 server/xml/macros/B.2.2.4.1.xml |   3 +-
 server/xml/macros/B.2.2.4.2.xml |  27 ++----
 server/xml/macros/B.2.2.7.xml   | 194 ++++++++++++++++++++++++++++------------
 server/xml/macros/B.2.2.8.xml   |   4 +-
 server/xml/macros/B.2.5.xml     |  46 ++++++----
 server/xml/macros/B.3.1.2.xml   |  12 +--
 server/xml/macros/B.3.1.3.xml   |   7 +-
 10 files changed, 209 insertions(+), 123 deletions(-)

diff --git a/server/xml/macros/B.1.4.xml b/server/xml/macros/B.1.4.xml
index 114e1c4..dab7b8d 100644
--- a/server/xml/macros/B.1.4.xml
+++ b/server/xml/macros/B.1.4.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <macro name="B.1.4" version="1.0">
-  <resume>Subjektivt er symptomerne ${amd.subjective_evaluation}</resume>
+  <resume>Subjektivt er symptomerne ${amd.subjective_evaluation}.</resume>
   <queries>
   </queries>
   <maps>
   </maps>
   <scripts>
   </scripts>
-  <window caption="Anamnese (B.1.4)"
+  <window caption="Subjektiv evaluering (B.1.4)"
           layout="vbox">
 
     <label caption="Subjektivt er symptomerne:"/>
diff --git a/server/xml/macros/B.2.1.3.xml b/server/xml/macros/B.2.1.3.xml
index 86ce8fb..746d4c9 100644
--- a/server/xml/macros/B.2.1.3.xml
+++ b/server/xml/macros/B.2.1.3.xml
@@ -72,10 +72,11 @@
   <window caption="Aktuelle (B.2.1.3)"
           layout="vbox">
 
-    <frame caption="Symptomliste" layout="hbox">
+    <frame layout="vbox">
+      <label caption="Symptomlister:"/>
 
-      <frame layout="vbox">
-	<label caption="Højre"/>
+      <frame layout="hbox">
+      <frame caption="Højre" layout="vbox">
 
 	<multilist name="current.symptoms.right" value=""
 		   innerwidget="aktuelle_entry_right" script="evolution_enable">
@@ -160,9 +161,7 @@
 	</multilist>
 	
       </frame>
-      <frame layout="vbox">
-	<label caption="Venstre"/>
-	
+      <frame caption="Venstre" layout="vbox">
 	<multilist name="current.symptoms.left" value=""
 		   innerwidget="aktuelle_entry_left" script="evolution_enable">
 	  
@@ -246,6 +245,7 @@
 	</multilist>
 	
       </frame>
+      </frame>
     </frame>
 
     <frame name="evolution" layout="hbox">
diff --git a/server/xml/macros/B.2.10.4.xml b/server/xml/macros/B.2.10.4.xml
index c9cd1fa..38b6709 100644
--- a/server/xml/macros/B.2.10.4.xml
+++ b/server/xml/macros/B.2.10.4.xml
@@ -10,11 +10,24 @@
   <window caption="Behandlingsindikation (B.2.10.4)"
           layout="vbox">
 
-<!--
-Drop down menu med to muligheder, nemlig:
-”Der findes indikation for at gentage behandlingen”
-”Der holdes pause med behandlingen”
--->
+    <frame layout="hbox">
+      <label caption="Øje:" width="50"/>
+      <radiobuttons name="amd.indication.eye" value="">
+	<radiobutton caption="o.dxt" value="o.dxt"/>
+	<radiobutton caption="o.sin" value="o.sin"/>
+      </radiobuttons>
+      <spacer/>
+    </frame>
+
+    <frame layout="vbox">
+      <label caption="Der findes indikation for:"/>
+      <combobox name="amd.indication">
+	<item caption="Der findes indikation for at gentage behandlingen."
+	      value="Der findes indikation for at gentage behandlingen."/>
+	<item caption="Der holdes pause med behandlingen."
+	      value="Der holdes pause med behandlingen."/>
+      </combobox>
+    </frame>
 
     <!-- Knapper -->
     <frame layout="hbox">
diff --git a/server/xml/macros/B.2.2.4.1.xml b/server/xml/macros/B.2.2.4.1.xml
index 740d6d0..1147739 100644
--- a/server/xml/macros/B.2.2.4.1.xml
+++ b/server/xml/macros/B.2.2.4.1.xml
@@ -28,7 +28,6 @@
         out = out .. 'OCT o.sin ' .. getValue('oct.left.thickness') .. ' µm\n'
       end
 
-      out = out .. 'Anamnese som anført'
     end
 
     return out
@@ -104,7 +103,7 @@
       return true
     </script>
   </scripts>
-  <window caption="OCT, u. konklusion (B.2.2.4.1)"
+  <window caption="OCT måling (B.2.2.4.1)"
           layout="vbox">
 
     <frame layout="hbox">
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"/>
diff --git a/server/xml/macros/B.2.2.7.xml b/server/xml/macros/B.2.2.7.xml
index d253d0d..0eeacca 100644
--- a/server/xml/macros/B.2.2.7.xml
+++ b/server/xml/macros/B.2.2.7.xml
@@ -7,83 +7,165 @@
     20090108: Bent Bisballe Nyeng
     Højre/venstre byttet om.
   -->
+<!--
+    20090320: Bent Bisballe Nyeng
+    Total omskrivning
+  -->
 <macro name="B.2.2.7" version="1.0">
   <resume>Inblikket til fundusbaggrunden er ${90D_lens.right.fundus_visibility} på højre øje og ${90D_lens.left.fundus_visibility} på venstre.
-${90D_lens.implications}</resume>
+${90D_lens.implications}
+${90D_lens.additional}</resume>
   <queries>
   </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="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>
+    <script language="lua" name="retinal_haevelse_right">
+      if ( value == 'retinal hævelse' )
+      then
+        enable('retinal_haevelse_right')
+      else
+        disable('retinal_haevelse_right')
+      end
+      return true
+    </script>
+    <script language="lua" name="retinal_haevelse_left">
+      if ( value == 'retinal hævelse' )
+      then
+        enable('retinal_haevelse_left')
+      else
+        disable('retinal_haevelse_left')
+      end
+      return true
+    </script>
   </scripts>
   <window caption="90-D linse (B.2.2.7)"
           layout="vbox">
     
-    <!-- Indblik -->
-    <frame layout="vbox">
-      <label caption="Indblik til fundusbaggrunden:"/>
-      <frame layout="hbox">
-
-	<label caption="Højre:"/>
-	<combobox name="90D_lens.right.fundus_visibility" value="klart">
-	  <item caption="Klart" value="klart"/>
-	  <item caption="Let sløret" value="let sløret"/>
-	  <item caption="Meget sløret" value="meget sløret"/>
-	  <item caption="Intet" value="intet"/>
-	</combobox>
-	<spacer/>
-
-	<label caption="Venstre:"/>
-	<combobox name="90D_lens.left.fundus_visibility" value="klart">
-	  <item caption="Klart" value="klart"/>
-	  <item caption="Let sløret" value="let sløret"/>
-	  <item caption="Meget sløret" value="meget sløret"/>
-	  <item caption="Intet" value="intet"/>
-	</combobox>
-	<spacer/>
+    <frame layout="hbox">
 
-      </frame>
-    </frame>
+      <!-- Højre øje -->
+      <frame layout="vbox">
+	<checkbox caption="Der er ikke målt på højre øje"
+		  name="90D_lens.right.missing" script="right_eye"
+		  map="missing_eye_right_map"
+		  truevalue="mangler" falsevalue="" value=""/>
+	<frame name="right_eye_frame" caption="Højre øje" layout="vbox">
+	  
+	  <!-- Indblik -->
+	  <combobox name="90D_lens.right.fundus_visibility" value="">
+	    <item caption="Klart" value="klart"/>
+	    <item caption="Let sløret" value="let sløret"/>
+	    <item caption="Meget sløret" value="meget sløret"/>
+	    <item caption="Intet" value="intet"/>
+	  </combobox>
 
-    <!-- Observationer -->
-    <frame caption="Observeret" layout="hbox">
-      <multilist name="90D_lens.implications" value="" layout="hbox" innerwidget="90dmeta">
-	<metawidget name="90dmeta" format="På ${eye} øje findes ${implikation}." layout="hbox">
+	  <!-- Observationer -->
+	  <radiobuttons name="90D_lens..right.implikation" value="" script="retinal_haevelse_right">
+	    <radiobutton caption="Retinal hævelse" value="retinal hævelse"/>
+	    <radiobutton caption="Atrofi" value="atrofi"/>
+	  </radiobuttons>
 
-	  <frame layout="vbox">
-	    <label caption=" "/>
-	    <label caption="På"/>
+	  <frame name="retinal_haevelse_right" layout="vbox">
+	    <checkbox name="90D_lens.right.randbl" caption="Randblødning"
+		      truevalue="randblødning" falsevalue="" value=""/>
+	    <checkbox name="90D_lens.right.exsudater" caption="Exsudater"
+		      truevalue="exsudater" falsevalue="" value=""/>
 	  </frame>
 
-	  <frame layout="vbox">
-	    <label caption="Øje:"/>
-	    <combobox name="eye" value="højre">
-	      <item caption="Højre" value="højre"/>
-	      <item caption="Venstre" value="venstre"/>
-	    </combobox>
-	  </frame>
+	</frame>
+      </frame>
+      
+      <!-- Venstre øje -->
+      <frame layout="vbox">
+	<checkbox caption="Der er ikke målt på venstre øje"
+		  name="90D_lens.left.missing" script="left_eye"
+		  map="missing_eye_left_map"
+		  truevalue="mangler" falsevalue="" value=""/>
+	<frame name="left_eye_frame" caption="Venstre øje" layout="vbox">
+	  
+	  <!-- Indblik -->
+	  <combobox name="90D_lens.left.fundus_visibility" value="">
+	    <item caption="Klart" value="klart"/>
+	    <item caption="Let sløret" value="let sløret"/>
+	    <item caption="Meget sløret" value="meget sløret"/>
+	    <item caption="Intet" value="intet"/>
+	  </combobox>
+	  
+	  <!-- Observationer -->
+	  <radiobuttons name="90D_lens.left.implikation" value="" script="retinal_haevelse_left">
+	    <radiobutton caption="Retinal hævelse" value="retinal hævelse"/>
+	    <radiobutton caption="Atrofi" value="atrofi"/>
+	  </radiobuttons>
 
-	  <frame layout="vbox">
-	    <label caption=""/>
-	    <label caption="øje findes"/>
+	  <frame name="retinal_haevelse_left" layout="vbox">
+	    <checkbox name="90D_lens.left.randbl" caption="Randblødning"
+		      truevalue="randblødning" falsevalue="" value=""/>
+	    <checkbox name="90D_lens.left.exsudater" caption="Exsudater"
+		      truevalue="exsudater" falsevalue="" value=""/>
 	  </frame>
 
-	  <frame layout="vbox">
-	    <label caption="Implikation:"/>
-	    <combobox name="implikation" value="atrofi">
-	      <item caption="Atrofi" value="atrofi"/>
-	      <item caption="Central hævelse" value="central hævelse"/>
-	      <item caption="Randblødning" value="randblødning"/>
-	      <item caption="Exsudater" value="exsudater"/>
-	    </combobox>
-	  </frame>
+	</frame>
+      </frame>
+    </frame>
 
-	  <spacer/>
+    <label caption="Supplerende:"/>
+    <textedit name="90D_lens.additional" value=""/>
 
-	</metawidget>
-      </multilist>
-    </frame>
-    
     <!-- Knapper -->
     <frame layout="hbox">
       <spacer/>
diff --git a/server/xml/macros/B.2.2.8.xml b/server/xml/macros/B.2.2.8.xml
index 82ea22f..04c5f06 100644
--- a/server/xml/macros/B.2.2.8.xml
+++ b/server/xml/macros/B.2.2.8.xml
@@ -27,8 +27,8 @@ ${amd_preop.conclusion_additional}${amd_preop.conclusion_terminated}.</resume>
 	<combobox name="amd_preop.conclusion"
 		  value=""
 		  script="afsluttes">
-	  <item caption="Ingen indikation for yderligere udredning."
-		value="Der findes ingen indikation for yderligere udredning."/>
+	  <item caption="Ingen indikation for yderligere udredning af AMD."
+		value="Der findes ingen indikation for yderligere udredning af AMD."/>
 	  <item caption="Der findes indikation for fluorescens angiografi"
 		value="Der findes indikation for fluorescens angiografi."/>
 	</combobox>
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">
diff --git a/server/xml/macros/B.3.1.2.xml b/server/xml/macros/B.3.1.2.xml
index bf4058f..b714f55 100644
--- a/server/xml/macros/B.3.1.2.xml
+++ b/server/xml/macros/B.3.1.2.xml
@@ -16,16 +16,8 @@
   </scripts>
   <window caption="Gennemgang af de 5 trin (B.3.1.2)" layout="vbox">
     <frame layout="vbox">
-      <frame layout="hbox">
-	<label caption="De 5 trin til forebyggelse af forveksling af øjnene er gennemgået:"/>
-      </frame>
-      <frame layout="hbox">
-	<radiobuttons name="five_steps" script="yes_only">
-	  <radiobutton value="ja" caption="Ja"/>
-	  <radiobutton value="nej" caption="Nej"/>
-	</radiobuttons>
-	<spacer />
-      </frame>
+      <checkbox name="five_steps" script="yes_only" truevalue="ja" falsevalue="nej"
+		caption="De 5 trin til forebyggelse af forveksling af øjnene er gennemgået:"/>
     </frame>
     <frame layout="hbox">
       <spacer/>
diff --git a/server/xml/macros/B.3.1.3.xml b/server/xml/macros/B.3.1.3.xml
index 2ea7743..10658f5 100644
--- a/server/xml/macros/B.3.1.3.xml
+++ b/server/xml/macros/B.3.1.3.xml
@@ -11,8 +11,9 @@ Lucentis ${lucentis_treatment.eye}
 Der dryppes med oculoguttae Tobrex over injektionsstedet.
 Herefter medgives oculoguttae Tobrex til drypning x 2 i 2 døgn i det
 behandlede øje.
-Der gives tid til kontrol og fornyet behandling om 1 måned.
-Møder til kontrol 1 måned efter behandling med Lucentis.</resume>
+Der gives tid til kontrol om 1 måned og stillingtagen til evt fornyet
+behandling.
+</resume>
   <queries>
   </queries>
   <maps>
@@ -33,7 +34,7 @@ Injektionsstedet nedadtil temporalt i konjunktiva afmærkes med passer 3,5 mm fr
       </frame>
       <label caption="Der dryppes med oculoguttae Tobrex over injektionsstedet.
 Herefter medgives oculoguttae Tobrex til drypning x 2 i 2 døgn i det behandlede øje.
-Der gives tid til kontrol og stillingtagen til evt fornyet behandling."/>
+Der gives tid til kontrol om 1 måned og stillingtagen til evt fornyet behandling."/>
     </frame>
     <frame layout="hbox">
       <spacer/>
-- 
cgit v1.2.3