From 7c8ea6210777accb150828e970cc980dfa863a49 Mon Sep 17 00:00:00 2001
From: senator <senator>
Date: Fri, 9 Oct 2009 06:49:07 +0000
Subject: all ref macros ready for 1st review

---
 server/xml/macros/akselaengde-1.0.xml              |   4 +-
 server/xml/macros/central_corneatykkelse-1.0.xml   |   2 +-
 server/xml/macros/manifest_refraktion-1.0.xml      | 298 -----------
 server/xml/macros/ref_aktuelle-1.0.xml             |   2 +-
 .../xml/macros/ref_behandling-klargoering-1.0.xml  |   2 +-
 server/xml/macros/ref_forunders-konklusion-1.0.xml | 123 +++++
 .../xml/macros/ref_forunders-spaltelampe-1.0.xml   | 577 +++++++++++++++++++++
 server/xml/macros/ref_kontrol-1.0.xml              |   2 +-
 server/xml/macros/ref_oejendrypning-1.0.xml        |   4 +-
 .../ref_tremaanederskontrol-spaltelampe-1.0.xml    |   4 +-
 server/xml/macros/topografi-1.0.xml                |   2 +-
 11 files changed, 711 insertions(+), 309 deletions(-)
 create mode 100644 server/xml/macros/ref_forunders-konklusion-1.0.xml
 create mode 100644 server/xml/macros/ref_forunders-spaltelampe-1.0.xml

(limited to 'server')

diff --git a/server/xml/macros/akselaengde-1.0.xml b/server/xml/macros/akselaengde-1.0.xml
index 1a06b19..83a90c3 100644
--- a/server/xml/macros/akselaengde-1.0.xml
+++ b/server/xml/macros/akselaengde-1.0.xml
@@ -9,12 +9,12 @@
 
     if ( getValue('akselaengde.right.missing') == '' )
     then
-      out = out .. 'Højre øje: ' .. getValue('akselaengde.right.length') .. '\n'
+      out = out .. 'Højre øje: ' .. getValue('akselaengde.right.length') .. ' mm\n'
     end
 
     if ( getValue('akselaengde.left.missing') == '' )
     then
-      out = out .. 'Venstre øje: ' .. getValue('akselaengde.left.length') .. '\n'
+      out = out .. 'Venstre øje: ' .. getValue('akselaengde.left.length') .. ' mm\n'
     end
 
     return out
diff --git a/server/xml/macros/central_corneatykkelse-1.0.xml b/server/xml/macros/central_corneatykkelse-1.0.xml
index 98547d7..6a0084d 100644
--- a/server/xml/macros/central_corneatykkelse-1.0.xml
+++ b/server/xml/macros/central_corneatykkelse-1.0.xml
@@ -140,7 +140,7 @@
     </frame>
 
     <frame name="device_frame" layout="vbox">
-      <label caption="Tonometri foretaget med:"/>
+      <label caption="Undersøgelse foretaget med:"/>
       <combobox name="central_corneatykkelse.method" value="">
 	<item caption="Automatisk CCT" value="Automatisk CCT"/>
 	<item caption="Pentacam" value="Pentacam"/>
diff --git a/server/xml/macros/manifest_refraktion-1.0.xml b/server/xml/macros/manifest_refraktion-1.0.xml
index 3d481a1..ba1216a 100644
--- a/server/xml/macros/manifest_refraktion-1.0.xml
+++ b/server/xml/macros/manifest_refraktion-1.0.xml
@@ -8,8 +8,6 @@
       out = out .. 'Højre øje: ' .. getValue('manifest_refraktion.right.sf')
         .. ' sf, ' .. getValue('manifest_refraktion.right.cyl') .. ' x ' 
         .. getValue('manifest_refraktion.right.grader') .. '\n'
-      out = out .. 'Snellen: ' .. getValue('manifest_refraktion.snellen.right') .. '\n'
-      out = out .. 'ETDRS: ' .. getValue('manifest_refraktion.etdrs.right') .. '\n'
     end
 
     if ( getValue('manifest_refraktion.left.missing') == '' )
@@ -17,8 +15,6 @@
       out = out .. 'Venstre øje: ' .. getValue('manifest_refraktion.left.sf')
         .. ' sf, ' .. getValue('manifest_refraktion.left.cyl') .. ' x '
         .. getValue('manifest_refraktion.left.grader') .. '\n'
-      out = out .. 'Snellen: ' .. getValue('manifest_refraktion.snellen.left') .. '\n'
-      out = out .. 'ETDRS: ' .. getValue('manifest_refraktion.etdrs.left') .. '\n'
     end
 
     return out
@@ -147,153 +143,6 @@
 		  map="missing_eye_right_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="right_eye_frame" caption="Højre øje" layout="vbox">
-	  <frame layout="hbox">
-	    <frame layout="vbox">
-	      <label caption="Snellen:"/>
-	      <altcombobox name="manifest_refraktion.snellen.right" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
-		<item caption="Ikke udfyldt" value="Ikke udfyldt"/>
-		<item caption="2,0" value="2,0"/>
-		<item caption="1,6" value="1,6"/>
-		<item caption="1,33" value="1,33"/>
-		<item caption="1,0" value="1,0"/>
-		<item caption="0,8" value="0,8"/>
-		<item caption="0,67" value="0,67"/>
-		<item caption="0,5" value="0,5"/>
-		<item caption="0,4" value="0,4"/>
-		<item caption="0,32" value="0,32"/>
-		<item caption="0,25" value="0,25"/>
-		<item caption="0,2" value="0,2"/>
-		<item caption="0,16" value="0,16"/>
-		<item caption="0,125" value="0,125"/>
-		<item caption="0,1" value="0,1"/>
-		<item caption="0,08" value="0,08"/>
-		<item caption="0,05" value="0,05"/>
-		<item caption="6/60" value="6/60"/>
-		<item caption="3/60" value="3/60"/>
-		<item caption="1/18" value="1/18"/>
-		<item caption="1/24" value="1/24"/>
-		<item caption="1/36" value="1/36"/>
-		<item caption="1/60" value="1/60"/>
-		<item caption="FGT" value="FGT"/>
-		<item caption="HBV" value="HBV"/>
-		<item caption="+L+P" value="+L+P"/>
-		<item caption="+L-P" value="+L-P"/>
-		<item caption="-L" value="-L"/>
-		<altitem caption="Andet" value="andet" innerwidget="hoejre_snellen_andet" layout="hbox">
-		  <label caption="Andet:"/>
-		  <lineedit name="hoejre_snellen_andet" regexp="[0-9]+(,\d+|\d*)"/>
-		</altitem>
-	      </altcombobox>
-	    </frame>
-	    <frame layout="vbox">
-	      <label caption="ETDRS:"/>
-	      <combobox name="manifest_refraktion.etdrs.right" value="Ikke udfyldt" type="search" script="not0">
-		<item caption="Ikke udfyldt" value="Ikke udfyldt"/>
-		<item caption="0" value="0"/>
-		<item caption="1" value="1"/>
-		<item caption="2" value="2"/>
-		<item caption="3" value="3"/>
-		<item caption="4" value="4"/>
-		<item caption="5" value="5"/>
-		<item caption="6" value="6"/>
-		<item caption="7" value="7"/>
-		<item caption="8" value="8"/>
-		<item caption="9" value="9"/>
-		<item caption="10" value="10"/>
-		<item caption="11" value="11"/>
-		<item caption="12" value="12"/>
-		<item caption="13" value="13"/>
-		<item caption="14" value="14"/>
-		<item caption="15" value="15"/>
-		<item caption="16" value="16"/>
-		<item caption="17" value="17"/>
-		<item caption="18" value="18"/>
-		<item caption="19" value="19"/>
-		<item caption="20" value="20"/>
-		<item caption="21" value="21"/>
-		<item caption="22" value="22"/>
-		<item caption="23" value="23"/>
-		<item caption="24" value="24"/>
-		<item caption="25" value="25"/>
-		<item caption="26" value="26"/>
-		<item caption="27" value="27"/>
-		<item caption="28" value="28"/>
-		<item caption="29" value="29"/>
-		<item caption="30" value="30"/>
-		<item caption="31" value="31"/>
-		<item caption="32" value="32"/>
-		<item caption="33" value="33"/>
-		<item caption="34" value="34"/>
-		<item caption="35" value="35"/>
-		<item caption="36" value="36"/>
-		<item caption="37" value="37"/>
-		<item caption="38" value="38"/>
-		<item caption="39" value="39"/>
-		<item caption="40" value="40"/>
-		<item caption="41" value="41"/>
-		<item caption="42" value="42"/>
-		<item caption="43" value="43"/>
-		<item caption="44" value="44"/>
-		<item caption="45" value="45"/>
-		<item caption="46" value="46"/>
-		<item caption="47" value="47"/>
-		<item caption="48" value="48"/>
-		<item caption="49" value="49"/>
-		<item caption="50" value="50"/>
-		<item caption="51" value="51"/>
-		<item caption="52" value="52"/>
-		<item caption="53" value="53"/>
-		<item caption="54" value="54"/>
-		<item caption="55" value="55"/>
-		<item caption="56" value="56"/>
-		<item caption="57" value="57"/>
-		<item caption="58" value="58"/>
-		<item caption="59" value="59"/>
-		<item caption="60" value="60"/>
-		<item caption="61" value="61"/>
-		<item caption="62" value="62"/>
-		<item caption="63" value="63"/>
-		<item caption="64" value="64"/>
-		<item caption="65" value="65"/>
-		<item caption="66" value="66"/>
-		<item caption="67" value="67"/>
-		<item caption="68" value="68"/>
-		<item caption="69" value="69"/>
-		<item caption="70" value="70"/>
-		<item caption="71" value="71"/>
-		<item caption="72" value="72"/>
-		<item caption="73" value="73"/>
-		<item caption="74" value="74"/>
-		<item caption="75" value="75"/>
-		<item caption="76" value="76"/>
-		<item caption="77" value="77"/>
-		<item caption="78" value="78"/>
-		<item caption="79" value="79"/>
-		<item caption="80" value="80"/>
-		<item caption="81" value="81"/>
-		<item caption="82" value="82"/>
-		<item caption="83" value="83"/>
-		<item caption="84" value="84"/>
-		<item caption="85" value="85"/>
-		<item caption="86" value="86"/>
-		<item caption="87" value="87"/>
-		<item caption="88" value="88"/>
-		<item caption="89" value="89"/>
-		<item caption="90" value="90"/>
-		<item caption="91" value="91"/>
-		<item caption="92" value="92"/>
-		<item caption="93" value="93"/>
-		<item caption="94" value="94"/>
-		<item caption="95" value="95"/>
-		<item caption="96" value="96"/>
-		<item caption="97" value="97"/>
-		<item caption="98" value="98"/>
-		<item caption="99" value="99"/>
-		<item caption="100" value="100"/>
-	      </combobox>
-	      <spacer/>
-	    </frame>
-	  </frame>
 	  
 	  <frame layout="hbox">
 	    <frame layout="vbox">
@@ -322,153 +171,6 @@
 		  map="missing_eye_left_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="left_eye_frame" caption="Venstre øje" layout="vbox">
-	  <frame layout="hbox">
-	    <frame layout="vbox">
-	      <label caption="Snellen:"/>
-	      <altcombobox name="manifest_refraktion.snellen.left" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
-		<item caption="Ikke udfyldt" value="Ikke udfyldt"/>
-		<item caption="2,0" value="2,0"/>
-		<item caption="1,6" value="1,6"/>
-		<item caption="1,33" value="1,33"/>
-		<item caption="1,0" value="1,0"/>
-		<item caption="0,8" value="0,8"/>
-		<item caption="0,67" value="0,67"/>
-		<item caption="0,5" value="0,5"/>
-		<item caption="0,4" value="0,4"/>
-		<item caption="0,32" value="0,32"/>
-		<item caption="0,25" value="0,25"/>
-		<item caption="0,2" value="0,2"/>
-		<item caption="0,16" value="0,16"/>
-		<item caption="0,125" value="0,125"/>
-		<item caption="0,1" value="0,1"/>
-		<item caption="0,08" value="0,08"/>
-		<item caption="0,05" value="0,05"/>
-		<item caption="6/60" value="6/60"/>
-		<item caption="3/60" value="3/60"/>
-		<item caption="1/18" value="1/18"/>
-		<item caption="1/24" value="1/24"/>
-		<item caption="1/36" value="1/36"/>
-		<item caption="1/60" value="1/60"/>
-		<item caption="FGT" value="FGT"/>
-		<item caption="HBV" value="HBV"/>
-		<item caption="+L+P" value="+L+P"/>
-		<item caption="+L-P" value="+L-P"/>
-		<item caption="-L" value="-L"/>
-		<altitem caption="Andet" value="andet" innerwidget="hoejre_snellen_andet" layout="hbox">
-		  <label caption="Andet:"/>
-		  <lineedit name="hoejre_snellen_andet" regexp="[0-9]+(,\d+|\d*)"/>
-		</altitem>
-	      </altcombobox>
-	    </frame>
-	    <frame layout="vbox">
-	      <label caption="ETDRS:"/>
-	      <combobox name="manifest_refraktion.etdrs.left" value="Ikke udfyldt" type="search" script="not0">
-		<item caption="Ikke udfyldt" value="Ikke udfyldt"/>
-		<item caption="0" value="0"/>
-		<item caption="1" value="1"/>
-		<item caption="2" value="2"/>
-		<item caption="3" value="3"/>
-		<item caption="4" value="4"/>
-		<item caption="5" value="5"/>
-		<item caption="6" value="6"/>
-		<item caption="7" value="7"/>
-		<item caption="8" value="8"/>
-		<item caption="9" value="9"/>
-		<item caption="10" value="10"/>
-		<item caption="11" value="11"/>
-		<item caption="12" value="12"/>
-		<item caption="13" value="13"/>
-		<item caption="14" value="14"/>
-		<item caption="15" value="15"/>
-		<item caption="16" value="16"/>
-		<item caption="17" value="17"/>
-		<item caption="18" value="18"/>
-		<item caption="19" value="19"/>
-		<item caption="20" value="20"/>
-		<item caption="21" value="21"/>
-		<item caption="22" value="22"/>
-		<item caption="23" value="23"/>
-		<item caption="24" value="24"/>
-		<item caption="25" value="25"/>
-		<item caption="26" value="26"/>
-		<item caption="27" value="27"/>
-		<item caption="28" value="28"/>
-		<item caption="29" value="29"/>
-		<item caption="30" value="30"/>
-		<item caption="31" value="31"/>
-		<item caption="32" value="32"/>
-		<item caption="33" value="33"/>
-		<item caption="34" value="34"/>
-		<item caption="35" value="35"/>
-		<item caption="36" value="36"/>
-		<item caption="37" value="37"/>
-		<item caption="38" value="38"/>
-		<item caption="39" value="39"/>
-		<item caption="40" value="40"/>
-		<item caption="41" value="41"/>
-		<item caption="42" value="42"/>
-		<item caption="43" value="43"/>
-		<item caption="44" value="44"/>
-		<item caption="45" value="45"/>
-		<item caption="46" value="46"/>
-		<item caption="47" value="47"/>
-		<item caption="48" value="48"/>
-		<item caption="49" value="49"/>
-		<item caption="50" value="50"/>
-		<item caption="51" value="51"/>
-		<item caption="52" value="52"/>
-		<item caption="53" value="53"/>
-		<item caption="54" value="54"/>
-		<item caption="55" value="55"/>
-		<item caption="56" value="56"/>
-		<item caption="57" value="57"/>
-		<item caption="58" value="58"/>
-		<item caption="59" value="59"/>
-		<item caption="60" value="60"/>
-		<item caption="61" value="61"/>
-		<item caption="62" value="62"/>
-		<item caption="63" value="63"/>
-		<item caption="64" value="64"/>
-		<item caption="65" value="65"/>
-		<item caption="66" value="66"/>
-		<item caption="67" value="67"/>
-		<item caption="68" value="68"/>
-		<item caption="69" value="69"/>
-		<item caption="70" value="70"/>
-		<item caption="71" value="71"/>
-		<item caption="72" value="72"/>
-		<item caption="73" value="73"/>
-		<item caption="74" value="74"/>
-		<item caption="75" value="75"/>
-		<item caption="76" value="76"/>
-		<item caption="77" value="77"/>
-		<item caption="78" value="78"/>
-		<item caption="79" value="79"/>
-		<item caption="80" value="80"/>
-		<item caption="81" value="81"/>
-		<item caption="82" value="82"/>
-		<item caption="83" value="83"/>
-		<item caption="84" value="84"/>
-		<item caption="85" value="85"/>
-		<item caption="86" value="86"/>
-		<item caption="87" value="87"/>
-		<item caption="88" value="88"/>
-		<item caption="89" value="89"/>
-		<item caption="90" value="90"/>
-		<item caption="91" value="91"/>
-		<item caption="92" value="92"/>
-		<item caption="93" value="93"/>
-		<item caption="94" value="94"/>
-		<item caption="95" value="95"/>
-		<item caption="96" value="96"/>
-		<item caption="97" value="97"/>
-		<item caption="98" value="98"/>
-		<item caption="99" value="99"/>
-		<item caption="100" value="100"/>
-	      </combobox>
-	      <spacer/>
-	    </frame>
-	  </frame>
 	  
 	  <frame layout="hbox">
 	    <frame layout="vbox">
diff --git a/server/xml/macros/ref_aktuelle-1.0.xml b/server/xml/macros/ref_aktuelle-1.0.xml
index 801b729..98e12f4 100644
--- a/server/xml/macros/ref_aktuelle-1.0.xml
+++ b/server/xml/macros/ref_aktuelle-1.0.xml
@@ -31,7 +31,7 @@
       <frame layout="vbox">
 	<label caption="Brillestyrken har været stabil i:"/>
 	<combobox name="ref_aktuelle.stability" layout="vbox">
-	  <item caption="&amp;lt; ½ år" value="&amp;lt; ½"/>
+	  <item caption="Under ½ år" value="under ½ år"/>
 	  <item caption="½ år" value="½ år"/>
 	  <item caption="1 år" value="1 år"/>
 	  <item caption="Over 1 år" value="over 1 år"/>
diff --git a/server/xml/macros/ref_behandling-klargoering-1.0.xml b/server/xml/macros/ref_behandling-klargoering-1.0.xml
index ea28f9b..6f4d08d 100644
--- a/server/xml/macros/ref_behandling-klargoering-1.0.xml
+++ b/server/xml/macros/ref_behandling-klargoering-1.0.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<macro name="ref_behandling.klargoering" version="1.0">
+<macro name="ref_behandlinghklargoering" version="1.0">
   <resume language="lua">
     out = ''
     out = out .. 'Patienten er klargjort til refraktiv kirurgi i henhold til afdelingens instruks.\n'
diff --git a/server/xml/macros/ref_forunders-konklusion-1.0.xml b/server/xml/macros/ref_forunders-konklusion-1.0.xml
new file mode 100644
index 0000000..311ccaf
--- /dev/null
+++ b/server/xml/macros/ref_forunders-konklusion-1.0.xml
@@ -0,0 +1,123 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="ref_forunders.konklusion" version="1.0">
+  <resume language="lua">
+    out = ''
+    out = out .. 'Konklusion:\n'
+    out = out .. getValue('ref_forunders.konklusion.konklusion') .. '. '
+    if ( getValue('ref_forunders.konklusion.konklusion') == 'Patienten er kandidat til refraktiv kirurgi' )
+    then
+    out = out .. 'Det aftales at foretage ' .. getValue('ref_forunders.konklusion.behandling') .. ' på ' .. getValue('ref_forunders.konklusion.oeje') .. '.\n'
+    out = out .. 'Behandlingen stiler mod ' .. getValue('ref_forunders.konklusion.maal') .. '. '
+    out = out .. getValue('ref_forunders.konklusion.informeret_samtykke') .. '.'
+    end
+    if (getValue('ref_forunders.konklusion.yderligere_kommentarer') ~= '' )
+    then
+    out = out .. '\n\n'
+    out = out .. getValue('ref_forunders.konklusion.yderligere_kommentarer')
+    end
+    return out
+  </resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+    <script language="lua" name="konklusion">
+      if ( getValue('ref_forunders.konklusion.konklusion') == 'Patienten er kandidat til refraktiv kirurgi' )
+      then
+        enable('ref_forunders.konklusion.behandling_frame')
+      else
+        disable('ref_forunders.konklusion.behandling_frame')
+      end
+      if ( getValue('ref_forunders.konklusion.konklusion') == '' )
+      then
+        return false
+      end
+      return true
+    </script>
+    <script language="lua" name="behandling">
+      if ( getValue('ref_forunders.konklusion.behandling') == 'Ikke udfyldt' )
+      then
+        return false
+      end
+      return true
+    </script>
+    <script language="lua" name="samtykke">
+      if ( getValue('ref_forunders.konklusion.informeret_samtykke') == 'Patienten er informeret om at der vil være rest-nærsynethed efter operationen' )
+      then
+        return true
+      end
+      return false
+    </script>
+  </scripts>
+  <widgets caption="Konklusion" layout="vbox">
+    <frame layout="vbox">
+      <label caption="Konklusion:"/>
+      <combobox name="ref_forunders.konklusion.konklusion" value="" script="konklusion">
+	<item caption="Patienten er kandidat til refraktiv kirurgi" value="Patienten er kandidat til refraktiv kirurgi"/>
+	<item caption="Patienten er ikke kandidat til refraktiv kirurgi" value="Patienten er ikke kandidat til refraktiv kirurgi"/>	
+      </combobox>
+      <frame caption="Aftale" name="ref_forunders.konklusion.behandling_frame" layout="vbox">
+	<frame layout="hbox">
+	  <frame layout="vbox">
+	    <label caption="Der aftales"/>
+	    <label/>
+	  </frame>
+	  <altcombobox name="ref_forunders.konklusion.behandling" value="" layout="vbox" script="behandling">
+	    <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
+	    <item caption="LASIK" value="LASIK"/>
+	    <item caption="PRK" value="PRK"/>
+	    <item caption="Topografistyret LASIK" value="Topografistyret LASIK"/>
+	    <item caption="Topografistyret PRK" value="Topografistyret PRK"/>
+	    <item caption="LASEK" value="LASEK"/>
+	    <altitem caption="Andet" value="andet" layout="hbox" innerwidget="ref_forunders.konklusion.behandling.andet">
+	      <label caption="Andet:"/>
+	      <lineedit name="ref_forunders.konklusion.behandling.andet"/>
+	    </altitem>
+	  </altcombobox>
+	  <frame layout="vbox">
+	    <label caption="på"/>
+	    <label/>
+	  </frame>
+	  <frame layout="vbox">
+	    <combobox name="ref_forunders.konklusion.oeje" value="">
+	      <item caption="Højre øje" value="højre øje"/>
+	      <item caption="Venstre øje" value="venstre øje"/>
+	      <item caption="Begge øjne" value="begge øjne"/>
+	    </combobox>
+	    <label/>
+	  </frame>
+	  <spacer/>
+	</frame>
+	<frame layout="hbox">
+	  <frame layout="vbox">
+	    <label caption="Behandlingen stiler mod"/>
+	    <label/>
+	  </frame>
+	  <altcombobox name="ref_forunders.konklusion.maal" value="" layout="vbox">
+	    <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
+	    <item caption="Emmetropi" value="emmetropi"/>
+	    <item caption="Størst mulig reduktion af nærsynetheden" value="størst mulig reduktion af nærsynetheden"/>
+	    <item caption="Let myopi (ca. -1 til -2 D)" value="let myopi (ca. -1 til -2 D)"/>
+	    <altitem caption="Andet" value="andet" layout="hbox" innerwidget="ref_forunders.konklusion.maal.andet">
+	      <label caption="Andet:"/>
+	      <lineedit name="ref_forunders.konklusion.maal.andet"/>
+	    </altitem>
+	  </altcombobox>
+	  <spacer/>
+	</frame>
+	<checkbox name="ref_forunders.konklusion.informeret_samtykke" caption="Patienten er informeret om at der vil være rest-nærsynethed efter operationen" truevalue="Patienten er informeret om at der vil være rest-nærsynethed efter operationen" falsevalue="" script="samtykke"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="Yderligere kommentarer:"/>
+	<lineedit name="ref_forunders.konklusion.yderligere_kommentarer"/>
+      </frame>
+    </frame>
+    
+    <!-- knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </widgets>
+</macro>
diff --git a/server/xml/macros/ref_forunders-spaltelampe-1.0.xml b/server/xml/macros/ref_forunders-spaltelampe-1.0.xml
new file mode 100644
index 0000000..2cc9365
--- /dev/null
+++ b/server/xml/macros/ref_forunders-spaltelampe-1.0.xml
@@ -0,0 +1,577 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="ref_forunders.spaltelampe" version="1.0">
+  <resume language="lua">
+    out = ''
+    if ( getValue('spaltelampe.right.missing') == '' )
+    then
+      out = out .. 'Spaltelampe, højre øje:\n'
+
+      if ( getValue('spaltelampe.right.konjuktiva') ~= '' )
+      then
+        out = out .. 'Konjuktiva: ' .. getValue('spaltelampe.right.konjuktiva') .. '\n'
+      end
+
+      out = out .. 'Cornea:\n'
+      if ( getValue('spaltelampe.right.epithel') ~= '' )
+      then
+        out = out .. '  Epithel: ' .. getValue('spaltelampe.right.epithel') .. '\n'
+      end
+      if ( getValue('spaltelampe.right.stroma') ~= '' )
+      then
+        out = out .. '  Stroma: ' .. getValue('spaltelampe.right.stroma') .. '\n'
+      end
+      if ( getValue('spaltelampe.right.flap') ~= '' )
+      then
+        out = out .. '  Flap: ' .. getValue('spaltelampe.right.flap') .. '\n'
+      end
+      if ( getValue('spaltelampe.right.folder') ~= '' )
+      then
+        out = out .. '  Folder: ' .. getValue('spaltelampe.right.folder') .. '\n'
+      end
+      if ( getValue('spaltelampe.right.interface.partikler') ~= '' or getValue('spaltelampe.right.interface.epithelindvaekst') ~= '' )
+      then
+        out = out .. '  Interface: '
+        if ( getValue('spaltelampe.right.interface.partikler') ~= '' )
+        then
+          out = out .. getValue('spaltelampe.right.interface.partikler')
+          if ( getValue('spaltelampe.right.interface.epithelindvaekst') ~= '' )
+          then
+            out = out .. ', '
+          end
+        end
+        if ( getValue('spaltelampe.right.interface.epithelindvaekst') ~= '' )
+        then
+          out = out .. getValue('spaltelampe.right.interface.epithelindvaekst') .. '\n'
+        else
+          out = out .. '\n'
+        end
+      end
+      if ( getValue('spaltelampe.right.endothel') ~= '' )
+      then
+        out = out .. '  Endothel: ' .. getValue('spaltelampe.right.endothel') .. '\n'
+      end
+      if ( getValue('spaltelampe.right.lens') ~= '' )
+      then
+        out = out .. 'Lens: ' .. getValue('spaltelampe.right.lens') .. '\n'
+      end
+      if ( getValue('spaltelampe.right.supplerende') ~= '' )
+      then
+        out = out .. getValue('spaltelampe.right.supplerende') .. '\n'
+      end
+    end
+
+    if ( getValue('spaltelampe.left.missing') == '' )
+    then
+      if ( getValue('spaltelampe.right.missing') == '' )
+      then
+        out = out .. '\n'
+      end
+      out = out .. 'Spaltelampe, venstre øje:\n'
+
+      if ( getValue('spaltelampe.left.konjuktiva') ~= '' )
+      then
+        out = out .. 'Konjuktiva: ' .. getValue('spaltelampe.left.konjuktiva') .. '\n'
+      end
+
+      out = out .. 'Cornea:\n'
+      if ( getValue('spaltelampe.left.epithel') ~= '' )
+      then
+        out = out .. '  Epithel: ' .. getValue('spaltelampe.left.epithel') .. '\n'
+      end
+      if ( getValue('spaltelampe.left.stroma') ~= '' )
+      then
+        out = out .. '  Stroma: ' .. getValue('spaltelampe.left.stroma') .. '\n'
+      end
+      if ( getValue('spaltelampe.left.flap') ~= '' )
+      then
+        out = out .. '  Flap: ' .. getValue('spaltelampe.left.flap') .. '\n'
+      end
+      if ( getValue('spaltelampe.left.folder') ~= '' )
+      then
+        out = out .. '  Folder: ' .. getValue('spaltelampe.left.folder') .. '\n'
+      end
+      if ( getValue('spaltelampe.left.interface.partikler') ~= '' or getValue('spaltelampe.left.interface.epithelindvaekst') ~= '' )
+      then
+        out = out .. '  Interface: '
+        if ( getValue('spaltelampe.left.interface.partikler') ~= '' )
+        then
+          out = out .. getValue('spaltelampe.left.interface.partikler')
+          if ( getValue('spaltelampe.left.interface.epithelindvaekst') ~= '' )
+          then
+            out = out .. ', '
+          end
+        end
+        if ( getValue('spaltelampe.left.interface.epithelindvaekst') ~= '' )
+        then
+          out = out .. getValue('spaltelampe.left.interface.epithelindvaekst') .. '\n'
+        else
+          out = out .. '\n'
+        end
+      end
+      if ( getValue('spaltelampe.left.endothel') ~= '' )
+      then
+        out = out .. '  Endothel: ' .. getValue('spaltelampe.left.endothel') .. '\n'
+      end
+      if ( getValue('spaltelampe.left.lens') ~= '' )
+      then
+        out = out .. 'Lens: ' .. getValue('spaltelampe.left.lens') .. '\n'
+      end
+      if ( getValue('spaltelampe.left.supplerende') ~= '' )
+      then
+        out = out .. getValue('spaltelampe.left.supplerende') .. '\n'
+      end
+    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 = ''
+
+      if( missing_eye_right )
+      then
+        if( missing_eye_right.value and missing_eye_right.value == '' )
+        then
+          value = ''
+          timestamp = missing_eye_right.timestamp
+          source = missing_eye_right.source
+        else
+          value = 'mangler'
+          timestamp = missing_eye_right.timestamp
+          source = missing_eye_right.source
+        end
+      end
+      return value, timestamp, source
+    </map>
+    <map name="missing_eye_left_map">
+      value = 0
+      timestamp = 0
+      source = ''
+      
+      if( missing_eye_left )
+      then
+        if( missing_eye_left.value and missing_eye_left.value == '' )
+        then
+          value = ''
+          timestamp = missing_eye_left.timestamp
+          source = missing_eye_left.source
+        else
+          value = 'mangler'
+          timestamp = missing_eye_left.timestamp
+          source = missing_eye_left.source
+        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>
+  </scripts>
+  <widgets caption="Spaltelampe"
+          layout="vbox">
+    
+    <frame layout="hbox">
+
+      <!-- Højre øje -->
+      <frame layout="vbox">
+	<checkbox caption="Der er ikke målt på højre øje"
+		  name="spaltelampe.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">
+
+	  <frame layout="hbox">
+	    <frame layout="vbox">
+	      <label caption="Konjuktiva:"/>
+	      <label/>
+	    </frame>
+	    <frame layout="vbox">
+	      <altcombobox name="spaltelampe.right.konjuktiva" layout="vbox" value="Bleg">
+		<item caption="Ikke udfyldt" value=""/>
+		<item caption="Bleg" value="Bleg"/>
+		<item caption="Injiceret" value="Injiceret"/>
+		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.konjuktiva.andet">
+		  <label caption="Andet:"/>
+		  <lineedit name="spaltelampe.right.konjuktiva.andet"/>
+		</altitem>
+ 	      </altcombobox>
+	    </frame>
+	  </frame>
+
+	  <frame layout="vbox" caption="Cornea:">
+
+	    <frame layout="hbox">
+	      <frame layout="vbox">
+		<label caption="Epithel:"/>
+		<label/>
+	      </frame>
+	      <frame layout="vbox">
+		<altcombobox name="spaltelampe.right.epithel" layout="vbox" value="Upåfaldende">
+		  <item caption="Upåfaldende" value="Upåfaldende"/>
+		  <item caption="Tørhedsforandringer" value="Tørhedsforandringer"/>
+		  <item caption="Mikrocyster" value="Mikrocyster"/>
+		  <item caption="Refraktile linier" value="Refraktile linier"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.epithel.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.right.epithel.andet"/>
+		  </altitem>
+ 		</altcombobox>
+	      </frame>
+	    </frame>
+
+	    <frame layout="hbox">
+	      <frame layout="vbox">
+		<label caption="Stroma:"/>
+		<label/>
+	      </frame>
+	      <frame layout="vbox">
+		<altcombobox name="spaltelampe.right.stroma" layout="vbox" value="Klart">
+		  <item caption="Ikke udfyldt" value=""/>
+		  <item caption="Klart" value="Klart"/>
+		  <item caption="Karindvækst" value="Karindvækst"/>
+		  <item caption="Makulering" value="Makulering"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.stroma.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.right.stroma.andet"/>
+		  </altitem>
+ 		</altcombobox>
+	      </frame>
+	    </frame>
+
+	    <frame layout="hbox">
+	      <frame layout="vbox">
+		<label caption="Flap:"/>
+		<label/>
+	      </frame>
+	      <frame layout="vbox">
+		<altcombobox name="spaltelampe.right.flap" layout="vbox" value="">
+		  <item caption="Ej relevant" value=""/>
+		  <item caption="Velplaceret" value="Velplaceret"/>
+		  <item caption="Dislokeret" value="Dislokeret"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.flap.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.right.flap.andet"/>
+		  </altitem>
+ 		</altcombobox>
+	      </frame>
+	    </frame>
+
+	    <frame layout="hbox">
+	      <frame layout="vbox">
+		<label caption="Folder:"/>
+		<label/>
+	      </frame>
+	      <frame layout="vbox">
+		<altcombobox name="spaltelampe.right.folder" layout="vbox" value="">
+		  <item caption="Ej relevant" value=""/>
+		  <item caption="Ingen" value="Ingen"/>
+		  <item caption="Mikrofolder" value="Mikrofolder"/>
+		  <item caption="Lette folder" value="Lette folder"/>
+		  <item caption="Udtalte folder" value="Udtalte folder"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.folder.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.right.folder.andet"/>
+		  </altitem>
+ 		</altcombobox>
+	      </frame>
+	    </frame>
+	    
+	    <frame layout="hbox" caption="Interface:">
+	      <frame layout="vbox">
+		<label caption="Partikler:"/>
+		<label/>
+		<label caption="Epithelindvækst:"/>
+		<label/>
+	      </frame>
+	      <frame layout="vbox">
+		<altcombobox name="spaltelampe.right.interface.partikler" layout="vbox" value="">
+		  <item caption="Ej relevant" value=""/>
+		  <item caption="Ingen partikler eller debris" value="Ingen partikler eller debris"/>
+		  <item caption="Enkelte partikler" value="Enkelte partikler"/>
+		  <item caption="Nogen partikler" value="Nogen partikler"/>
+		  <item caption="Udtalte partikler" value="Udtalte partikler"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.interface.partikler.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.right.interface.partikler.andet"/>
+		  </altitem>
+ 		</altcombobox>
+		<altcombobox name="spaltelampe.right.interface.epithelindvaekst" layout="vbox" value="">
+		  <item caption="Ej relevant" value=""/>
+		  <item caption="Ingen epithelindvækst" value="Ingen epithelindvækst"/>
+		  <item caption="Diskret epithelindvækst" value="Diskret epithelindvækst"/>
+		  <item caption="Let epithelindvækst" value="Let epithelindvækst"/>
+		  <item caption="Betydende epithelindvækst" value="Betydende epithelindvækst"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.interface.epithelindvaekst.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.right.interface.epithelindvaekst.andet"/>
+		  </altitem>
+ 		</altcombobox>
+	      </frame>
+	    </frame>
+
+	    <frame layout="hbox">
+	      <frame layout="vbox">
+		<label caption="Endothel:"/>
+		<label/>
+	      </frame>
+	      <frame layout="vbox">
+		<altcombobox name="spaltelampe.right.endothel" layout="vbox" value="Upåfaldende">
+		  <item caption="Upåfaldende" value="Upåfaldende"/>
+		  <item caption="Guttatae" value="Guttatae"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.endothel.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.right.endothel.andet"/>
+		  </altitem>
+ 		</altcombobox>
+	      </frame>
+	    </frame>
+	    
+	  </frame>
+
+	  <frame layout="hbox">
+	    <frame layout="vbox">
+	      <label caption="Lens:"/>
+	      <label/>
+	    </frame>
+	    <frame layout="vbox">
+	      <altcombobox name="spaltelampe.right.lens" layout="vbox" value="Klar">
+		<item caption="Klar" value="Klar"/>
+		<item caption="Katarakt-1" value="Katarakt-1"/>
+		<item caption="Katarakt-2" value="Katarakt-2"/>
+		<item caption="Katarakt-3" value="Katarakt-3"/>
+		<item caption="Katarakt-4" value="Katarakt-4"/>
+		<item caption="Pseudofak" value="Pseudofak"/>
+		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.lens.andet">
+		  <label caption="Andet:"/>
+		  <lineedit name="spaltelampe.right.lens.andet"/>
+		</altitem>
+ 	      </altcombobox>
+	    </frame>
+	  </frame>
+
+	  <frame layout="vbox">
+	    <label caption="Supplerende:"/>
+	    <lineedit name="spaltelampe.right.supplerende"/>
+	  </frame>
+	  
+	</frame>
+      </frame>
+      
+      <!-- Venstre øje -->
+      <frame layout="vbox">
+	<checkbox caption="Der er ikke målt på venstre øje"
+		  name="spaltelampe.left.missing" script="left_eye"
+		  map="missing_eye_left_map"
+		  truevalue="mangler" falsevalue="" value=""/>
+	<frame name="left_eye_frame" caption="Højre øje" layout="vbox">
+
+	  <frame layout="hbox">
+	    <frame layout="vbox">
+	      <label caption="Konjuktiva:"/>
+	      <label/>
+	    </frame>
+	    <frame layout="vbox">
+	      <altcombobox name="spaltelampe.left.konjuktiva" layout="vbox" value="Bleg">
+		<item caption="Ikke udfyldt" value=""/>
+		<item caption="Bleg" value="Bleg"/>
+		<item caption="Injiceret" value="Injiceret"/>
+		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.konjuktiva.andet">
+		  <label caption="Andet:"/>
+		  <lineedit name="spaltelampe.left.konjuktiva.andet"/>
+		</altitem>
+ 	      </altcombobox>
+	    </frame>
+	  </frame>
+
+	  <frame layout="vbox" caption="Cornea:">
+
+	    <frame layout="hbox">
+	      <frame layout="vbox">
+		<label caption="Epithel:"/>
+		<label/>
+	      </frame>
+	      <frame layout="vbox">
+		<altcombobox name="spaltelampe.left.epithel" layout="vbox" value="Upåfaldende">
+		  <item caption="Upåfaldende" value="Upåfaldende"/>
+		  <item caption="Tørhedsforandringer" value="Tørhedsforandringer"/>
+		  <item caption="Mikrocyster" value="Mikrocyster"/>
+		  <item caption="Refraktile linier" value="Refraktile linier"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.epithel.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.left.epithel.andet"/>
+		  </altitem>
+ 		</altcombobox>
+	      </frame>
+	    </frame>
+
+	    <frame layout="hbox">
+	      <frame layout="vbox">
+		<label caption="Stroma:"/>
+		<label/>
+	      </frame>
+	      <frame layout="vbox">
+		<altcombobox name="spaltelampe.left.stroma" layout="vbox" value="Klart">
+		  <item caption="Ikke udfyldt" value=""/>
+		  <item caption="Klart" value="Klart"/>
+		  <item caption="Karindvækst" value="Karindvækst"/>
+		  <item caption="Makulering" value="Makulering"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.stroma.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.left.stroma.andet"/>
+		  </altitem>
+ 		</altcombobox>
+	      </frame>
+	    </frame>
+
+	    <frame layout="hbox">
+	      <frame layout="vbox">
+		<label caption="Flap:"/>
+		<label/>
+	      </frame>
+	      <frame layout="vbox">
+		<altcombobox name="spaltelampe.left.flap" layout="vbox" value="">
+		  <item caption="Ej relevant" value=""/>
+		  <item caption="Velplaceret" value="Velplaceret"/>
+		  <item caption="Dislokeret" value="Dislokeret"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.flap.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.left.flap.andet"/>
+		  </altitem>
+ 		</altcombobox>
+	      </frame>
+	    </frame>
+
+	    <frame layout="hbox">
+	      <frame layout="vbox">
+		<label caption="Folder:"/>
+		<label/>
+	      </frame>
+	      <frame layout="vbox">
+		<altcombobox name="spaltelampe.left.folder" layout="vbox" value="">
+		  <item caption="Ej relevant" value=""/>
+		  <item caption="Ingen" value="Ingen"/>
+		  <item caption="Mikrofolder" value="Mikrofolder"/>
+		  <item caption="Lette folder" value="Lette folder"/>
+		  <item caption="Udtalte folder" value="Udtalte folder"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.folder.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.left.folder.andet"/>
+		  </altitem>
+ 		</altcombobox>
+	      </frame>
+	    </frame>
+	    
+	    <frame layout="hbox" caption="Interface:">
+	      <frame layout="vbox">
+		<label caption="Partikler:"/>
+		<label/>
+		<label caption="Epithelindvækst:"/>
+		<label/>
+	      </frame>
+	      <frame layout="vbox">
+		<altcombobox name="spaltelampe.left.partikler" layout="vbox" value="">
+		  <item caption="Ej relevant" value=""/>
+		  <item caption="Ingen partikler eller debris" value="Ingen partikler eller debris"/>
+		  <item caption="Enkelte partikler" value="Enkelte partikler"/>
+		  <item caption="Nogen partikler" value="Nogen partikler"/>
+		  <item caption="Udtalte partikler" value="Udtalte partikler"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.partikler.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.left.partikler.andet"/>
+		  </altitem>
+ 		</altcombobox>
+		<altcombobox name="spaltelampe.left.epithelindvaekst" layout="vbox" value="">
+		  <item caption="Ej relevant" value=""/>
+		  <item caption="Ingen epithelindvækst" value="Ingen epithelindvækst"/>
+		  <item caption="Diskret epithelindvækst" value="Diskret epithelindvækst"/>
+		  <item caption="Let epithelindvækst" value="Let epithelindvækst"/>
+		  <item caption="Betydende epithelindvækst" value="Betydende epithelindvækst"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.epithelindvaekst.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.left.epithelindvaekst.andet"/>
+		  </altitem>
+ 		</altcombobox>
+	      </frame>
+	    </frame>
+
+	    <frame layout="hbox">
+	      <frame layout="vbox">
+		<label caption="Endothel:"/>
+		<label/>
+	      </frame>
+	      <frame layout="vbox">
+		<altcombobox name="spaltelampe.left.endothel" layout="vbox" value="Upåfaldende">
+		  <item caption="Upåfaldende" value="Upåfaldende"/>
+		  <item caption="Guttatae" value="Guttatae"/>
+		  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.endothel.andet">
+		    <label caption="Andet:"/>
+		    <lineedit name="spaltelampe.left.endothel.andet"/>
+		  </altitem>
+ 		</altcombobox>
+	      </frame>
+	    </frame>
+	    
+	  </frame>
+
+	  <frame layout="hbox">
+	    <frame layout="vbox">
+	      <label caption="Lens:"/>
+	      <label/>
+	    </frame>
+	    <frame layout="vbox">
+	      <altcombobox name="spaltelampe.left.lens" layout="vbox" value="Klar">
+		<item caption="Klar" value="Klar"/>
+		<item caption="Katarakt-1" value="Katarakt-1"/>
+		<item caption="Katarakt-2" value="Katarakt-2"/>
+		<item caption="Katarakt-3" value="Katarakt-3"/>
+		<item caption="Katarakt-4" value="Katarakt-4"/>
+		<item caption="Pseudofak" value="Pseudofak"/>
+		<altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.lens.andet">
+		  <label caption="Andet:"/>
+		  <lineedit name="spaltelampe.left.lens.andet"/>
+		</altitem>
+ 	      </altcombobox>
+	    </frame>
+	  </frame>
+
+	  <frame layout="vbox">
+	    <label caption="Supplerende:"/>
+	    <lineedit name="spaltelampe.left.supplerende"/>
+	  </frame>
+	  
+	</frame>
+      </frame>
+
+    </frame>
+
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </widgets>
+</macro>
diff --git a/server/xml/macros/ref_kontrol-1.0.xml b/server/xml/macros/ref_kontrol-1.0.xml
index 86343ee..c7e96be 100644
--- a/server/xml/macros/ref_kontrol-1.0.xml
+++ b/server/xml/macros/ref_kontrol-1.0.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <macro name="ref_kontrol" version="1.0">
-  <resume language="pracro">${ref.kontrol}
+  <resume language="pracro">${ref.kontrol}.
 </resume>
   <queries>
   </queries>
diff --git a/server/xml/macros/ref_oejendrypning-1.0.xml b/server/xml/macros/ref_oejendrypning-1.0.xml
index d564238..c1392dd 100644
--- a/server/xml/macros/ref_oejendrypning-1.0.xml
+++ b/server/xml/macros/ref_oejendrypning-1.0.xml
@@ -3,10 +3,10 @@
   <resume language="lua">
     out = ''
     out = out .. 'Postoperativ behandling med:\n'
-    out = out .. getValue('ref.oejendrypning.drypperegime') .. ' ' .. getValue('ref.oejendrypning.ordinering') .. '\n'
+    out = out .. getValue('ref.oejendrypning.drypperegime') .. ' ' .. getValue('ref.oejendrypning.ordinering') .. '.\n'
     if ( getValue('ref.oejendrypning.mod_smerter') ~= '' )
     then
-      out = out .. getValue('ref.oejendrypning.mod_smerter')
+      out = out .. getValue('ref.oejendrypning.mod_smerter') .. '.'
     end
     return out
 </resume>
diff --git a/server/xml/macros/ref_tremaanederskontrol-spaltelampe-1.0.xml b/server/xml/macros/ref_tremaanederskontrol-spaltelampe-1.0.xml
index 3aeec87..f98ec21 100644
--- a/server/xml/macros/ref_tremaanederskontrol-spaltelampe-1.0.xml
+++ b/server/xml/macros/ref_tremaanederskontrol-spaltelampe-1.0.xml
@@ -209,7 +209,7 @@
 	      <label/>
 	    </frame>
 	    <frame layout="vbox">
-	      <altcombobox name="spaltelampe.right.konjuktiva" layout="vbox" value="">
+	      <altcombobox name="spaltelampe.right.konjuktiva" layout="vbox" value="Bleg">
 		<item caption="Ikke udfyldt" value=""/>
 		<item caption="Bleg" value="Bleg"/>
 		<item caption="Injiceret" value="Injiceret"/>
@@ -397,7 +397,7 @@
 	      <label/>
 	    </frame>
 	    <frame layout="vbox">
-	      <altcombobox name="spaltelampe.left.konjuktiva" layout="vbox" value="">
+	      <altcombobox name="spaltelampe.left.konjuktiva" layout="vbox" value="Bleg">
 		<item caption="Ikke udfyldt" value=""/>
 		<item caption="Bleg" value="Bleg"/>
 		<item caption="Injiceret" value="Injiceret"/>
diff --git a/server/xml/macros/topografi-1.0.xml b/server/xml/macros/topografi-1.0.xml
index 545128f..8221ad6 100644
--- a/server/xml/macros/topografi-1.0.xml
+++ b/server/xml/macros/topografi-1.0.xml
@@ -4,7 +4,7 @@
     out = ''
     if ( getValue('topografi.right.missing') == '' or getValue('topografi.left.missing') == '' )
     then
-      out = out .. 'Topografi: ' .. getValue('topografi.method') .. '\n'
+      out = out .. 'Topografi, ' .. getValue('topografi.method') .. ':\n'
     end
 
     if ( getValue('topografi.right.missing') == '' )
-- 
cgit v1.2.3