initial release

3 files changed, 736 insertions, 0 deletions

diff --git a/server/xml/macros/farvesynstest-1.0.xml b/server/xml/macros/farvesynstest-1.0.xml
new file mode 100644
index 0000000..b3d8462
--- /dev/null
+++ b/server/xml/macros/farvesynstest-1.0.xml
@@ -0,0 +1,594 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="farvesynstest" version="1.0">
+  <resume language="lua">
+    transformation = ''
+    vanishing = ''
+    hidden = ''
+    diagnostic = ''
+    out = ''
+
+    if ( getValue('farvesynstest.transformation.12.checkbox') == 'correct' )
+    then
+      transformation = transformation .. '12 '
+    else
+      transformation = transformation .. getValue('farvesynstest.transformation.12') .. ' '
+    end
+    if ( getValue('farvesynstest.transformation.8.checkbox') == 'correct' )
+    then
+      transformation = transformation .. '8 '
+    else
+      transformation = transformation .. getValue('farvesynstest.transformation.8') .. ' '
+    end
+    if ( getValue('farvesynstest.transformation.6.checkbox') == 'correct' )
+    then
+      transformation = transformation .. '6 '
+    else
+      transformation = transformation .. getValue('farvesynstest.transformation.6') .. ' '
+    end
+    if ( getValue('farvesynstest.transformation.29.checkbox') == 'correct' )
+    then
+      transformation = transformation .. '29 '
+    else
+      transformation = transformation .. getValue('farvesynstest.transformation.29') .. ' '
+    end
+    if ( getValue('farvesynstest.transformation.57.checkbox') == 'correct' )
+    then
+      transformation = transformation .. '57 '
+    else
+      transformation = transformation .. getValue('farvesynstest.transformation.57') .. ' '
+    end
+    if ( getValue('farvesynstest.transformation.5.checkbox') == 'correct' )
+    then
+      transformation = transformation .. '5 '
+    else
+      transformation = transformation .. getValue('farvesynstest.transformation.5') .. ' '
+    end
+    if ( getValue('farvesynstest.transformation.3.checkbox') == 'correct' )
+    then
+      transformation = transformation .. '3 '
+    else
+      transformation = transformation .. getValue('farvesynstest.transformation.3') .. ' '
+    end
+    if ( getValue('farvesynstest.transformation.15.checkbox') == 'correct' )
+    then
+      transformation = transformation .. '15 '
+    else
+      transformation = transformation .. getValue('farvesynstest.transformation.15') .. ' '
+    end
+    if ( getValue('farvesynstest.transformation.74.checkbox') == 'correct' )
+    then
+      transformation = transformation .. '74 '
+    else
+      transformation = transformation .. getValue('farvesynstest.transformation.74') .. ' '
+    end
+
+    if ( getValue('farvesynstest.vanishing.2.checkbox') == 'correct' )
+    then
+      vanishing = vanishing .. '2 '
+    else
+      vanishing = vanishing .. getValue('farvesynstest.vanishing.2') .. ' '
+    end
+    if ( getValue('farvesynstest.vanishing.6.checkbox') == 'correct' )
+    then
+      vanishing = vanishing .. '6 '
+    else
+      vanishing = vanishing .. getValue('farvesynstest.vanishing.6') .. ' '
+    end
+    if ( getValue('farvesynstest.vanishing.97.checkbox') == 'correct' )
+    then
+      vanishing = vanishing .. '97 '
+    else
+      vanishing = vanishing .. getValue('farvesynstest.vanishing.97') .. ' '
+    end
+    if ( getValue('farvesynstest.vanishing.45.checkbox') == 'correct' )
+    then
+      vanishing = vanishing .. '45 '
+    else
+      vanishing = vanishing .. getValue('farvesynstest.vanishing.45') .. ' '
+    end
+    if ( getValue('farvesynstest.vanishing.5.checkbox') == 'correct' )
+    then
+      vanishing = vanishing .. '5 '
+    else
+      vanishing = vanishing .. getValue('farvesynstest.vanishing.5') .. ' '
+    end
+    if ( getValue('farvesynstest.vanishing.7.checkbox') == 'correct' )
+    then
+      vanishing = vanishing .. '7 '
+    else
+      vanishing = vanishing .. getValue('farvesynstest.vanishing.7') .. ' '
+    end
+    if ( getValue('farvesynstest.vanishing.16.checkbox') == 'correct' )
+    then
+      vanishing = vanishing .. '16 '
+    else
+      vanishing = vanishing .. getValue('farvesynstest.vanishing.16') .. ' '
+    end
+    if ( getValue('farvesynstest.vanishing.73.checkbox') == 'correct' )
+    then
+      vanishing = vanishing .. '73 '
+    else
+      vanishing = vanishing .. getValue('farvesynstest.vanishing.73') .. ' '
+    end
+
+    if ( getValue('farvesynstest.hidden.1.checkbox') == 'correct' )
+    then
+      hidden = hidden .. '- '
+    else
+      hidden = hidden .. getValue('farvesynstest.hidden.1') .. ' '
+    end
+    if ( getValue('farvesynstest.hidden.2.checkbox') == 'correct' )
+    then
+      hidden = hidden .. '- '
+    else
+      hidden = hidden .. getValue('farvesynstest.hidden.2') .. ' '
+    end
+    if ( getValue('farvesynstest.hidden.3.checkbox') == 'correct' )
+    then
+      hidden = hidden .. '- '
+    else
+      hidden = hidden .. getValue('farvesynstest.hidden.3') .. ' '
+    end
+    if ( getValue('farvesynstest.hidden.4.checkbox') == 'correct' )
+    then
+      hidden = hidden .. '- '
+    else
+      hidden = hidden .. getValue('farvesynstest.hidden.4') .. ' '
+    end
+
+    if ( getValue('farvesynstest.diagnostic.26.checkbox') == 'correct' )
+    then
+      diagnostic = diagnostic .. '26 '
+    else
+      diagnostic = diagnostic .. getValue('farvesynstest.diagnostic.26') .. ' '
+    end
+    if ( getValue('farvesynstest.diagnostic.42.checkbox') == 'correct' )
+    then
+      diagnostic = diagnostic .. '42 '
+    else
+      diagnostic = diagnostic .. getValue('farvesynstest.diagnostic.42') .. ' '
+    end
+    if ( getValue('farvesynstest.diagnostic.35.checkbox') == 'correct' )
+    then
+      diagnostic = diagnostic .. '35 '
+    else
+      diagnostic = diagnostic .. getValue('farvesynstest.diagnostic.35') .. ' '
+    end
+    if ( getValue('farvesynstest.diagnostic.96.checkbox') == 'correct' )
+    then
+      diagnostic = diagnostic .. '96 '
+    else
+      diagnostic = diagnostic .. getValue('farvesynstest.diagnostic.96') .. ' '
+    end
+
+    out = out .. "Transformation:"
+    for i = 0, string.len(transformation) - 15, 1 do
+      out = out .. ' '
+    end
+    out = out .. "| Vanishing:\n"
+    out = out .. transformation .. ' | '
+    out = out .. vanishing .. '\n'
+    out = out .. "Hidden:"
+    for i = 0, string.len(hidden) - 7, 1 do
+      out = out .. ' '
+    end
+    out = out .. "| Diagnostic\n"
+    out = out .. hidden .. " | "
+    out = out .. diagnostic .. '\n'
+
+    return out
+</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+    <script language="lua" name="not0">
+      if(value == '')
+      then
+        return false
+      end
+      return true
+    </script>
+    <script language="lua" name="t12">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.transformation.12')
+      else
+        disable('farvesynstest.transformation.12')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="t8">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.transformation.8')
+      else
+        disable('farvesynstest.transformation.8')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="t6">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.transformation.6')
+      else
+        disable('farvesynstest.transformation.6')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="t29">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.transformation.29')
+      else
+        disable('farvesynstest.transformation.29')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="t57">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.transformation.57')
+      else
+        disable('farvesynstest.transformation.57')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="t5">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.transformation.5')
+      else
+        disable('farvesynstest.transformation.5')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="t3">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.transformation.3')
+      else
+        disable('farvesynstest.transformation.3')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="t15">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.transformation.15')
+      else
+        disable('farvesynstest.transformation.15')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="t74">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.transformation.74')
+      else
+        disable('farvesynstest.transformation.74')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="v2">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.vanishing.2')
+      else
+        disable('farvesynstest.vanishing.2')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="v6">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.vanishing.6')
+      else
+        disable('farvesynstest.vanishing.6')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="v97">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.vanishing.97')
+      else
+        disable('farvesynstest.vanishing.97')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="v45">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.vanishing.45')
+      else
+        disable('farvesynstest.vanishing.45')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="v5">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.vanishing.5')
+      else
+        disable('farvesynstest.vanishing.5')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="v7">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.vanishing.7')
+      else
+        disable('farvesynstest.vanishing.7')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="v16">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.vanishing.16')
+      else
+        disable('farvesynstest.vanishing.16')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="v73">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.vanishing.73')
+      else
+        disable('farvesynstest.vanishing.73')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="h1">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.hidden.1')
+      else
+        disable('farvesynstest.hidden.1')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="h2">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.hidden.2')
+      else
+        disable('farvesynstest.hidden.2')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="h3">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.hidden.3')
+      else
+        disable('farvesynstest.hidden.3')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="h4">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.hidden.4')
+      else
+        disable('farvesynstest.hidden.4')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="d26">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.diagnostic.26')
+      else
+        disable('farvesynstest.diagnostic.26')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="d42">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.diagnostic.42')
+      else
+        disable('farvesynstest.diagnostic.42')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="d35">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.diagnostic.35')
+      else
+        disable('farvesynstest.diagnostic.35')
+      end
+
+      return true
+    </script>
+    <script language="lua" name="d96">
+      if ( value == 'wrong' )
+      then
+        enable('farvesynstest.diagnostic.96')
+      else
+        disable('farvesynstest.diagnostic.96')
+      end
+
+      return true
+    </script>
+  </scripts>
+  <widgets caption="Farvesynstest" layout="vbox">
+    <label caption="Ved korrekt svar, sæt kryds i boksen. Ved forkert svar, anfør svaret i tekstfeltet."/>
+    <label caption=""/>
+    <label caption="Transformation:"/>
+    <frame layout="hbox">
+      <frame layout="vbox">
+	<label caption="12"/>
+	<checkbox name="farvesynstest.transformation.12.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="t12"/>
+	<lineedit name="farvesynstest.transformation.12" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="8"/>
+	<checkbox name="farvesynstest.transformation.8.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="t8"/>
+	<lineedit name="farvesynstest.transformation.8" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="6"/>
+	<checkbox name="farvesynstest.transformation.6.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="t6"/>
+	<lineedit name="farvesynstest.transformation.6" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="29"/>
+	<checkbox name="farvesynstest.transformation.29.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="t29"/>
+	<lineedit name="farvesynstest.transformation.29" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="57"/>
+	<checkbox name="farvesynstest.transformation.57.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="t57"/>
+	<lineedit name="farvesynstest.transformation.57" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="5"/>
+	<checkbox name="farvesynstest.transformation.5.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="t5"/>
+	<lineedit name="farvesynstest.transformation.5" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="3"/>
+	<checkbox name="farvesynstest.transformation.3.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="t3"/>
+	<lineedit name="farvesynstest.transformation.3" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="15"/>
+	<checkbox name="farvesynstest.transformation.15.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="t15"/>
+	<lineedit name="farvesynstest.transformation.15" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="74"/>
+	<checkbox name="farvesynstest.transformation.74.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="t74"/>
+	<lineedit name="farvesynstest.transformation.74" value="" regexp="\d{1,2}"/>
+      </frame>
+    </frame>
+    <label caption=""/>
+    <label caption="Vanishing:"/>
+    <frame layout="hbox">
+      <frame layout="vbox">
+	<label caption="2"/>
+	<checkbox name="farvesynstest.vanishing.2.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="v2"/>
+	<lineedit name="farvesynstest.vanishing.2" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="6"/>
+	<checkbox name="farvesynstest.vanishing.6.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="v6"/>
+	<lineedit name="farvesynstest.vanishing.6" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="97"/>
+	<checkbox name="farvesynstest.vanishing.97.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="v97"/>
+	<lineedit name="farvesynstest.vanishing.97" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="45"/>
+	<checkbox name="farvesynstest.vanishing.45.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="v45"/>
+	<lineedit name="farvesynstest.vanishing.45" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="5"/>
+	<checkbox name="farvesynstest.vanishing.5.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="v5"/>
+	<lineedit name="farvesynstest.vanishing.5" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="7"/>
+	<checkbox name="farvesynstest.vanishing.7.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="v7"/>
+	<lineedit name="farvesynstest.vanishing.7" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="16"/>
+	<checkbox name="farvesynstest.vanishing.16.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="v16"/>
+	<lineedit name="farvesynstest.vanishing.16" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="73"/>
+	<checkbox name="farvesynstest.vanishing.73.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="v73"/>
+	<lineedit name="farvesynstest.vanishing.73" value="" regexp="\d{1,2}"/>
+      </frame>
+    </frame>
+    <label caption=""/>
+    <label caption="Hidden:"/>
+    <frame layout="hbox">
+      <frame layout="vbox">
+	<label caption="-"/>
+	<checkbox name="farvesynstest.hidden.1.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="h1"/>
+	<lineedit name="farvesynstest.hidden.1" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="-"/>
+	<checkbox name="farvesynstest.hidden.2.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="h2"/>
+	<lineedit name="farvesynstest.hidden.2" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="-"/>
+	<checkbox name="farvesynstest.hidden.3.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="h3"/>
+	<lineedit name="farvesynstest.hidden.3" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="-"/>
+	<checkbox name="farvesynstest.hidden.4.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="h4"/>
+	<lineedit name="farvesynstest.hidden.4" value="" regexp="\d{1,2}"/>
+      </frame>
+    </frame>
+    <label caption=""/>
+    <label caption="Diagnostic:"/>
+    <frame layout="hbox">
+      <frame layout="vbox">
+	<label caption="26"/>
+	<checkbox name="farvesynstest.diagnostic.26.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="d26"/>
+	<lineedit name="farvesynstest.diagnostic.26" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="42"/>
+	<checkbox name="farvesynstest.diagnostic.42.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="d42"/>
+	<lineedit name="farvesynstest.diagnostic.42" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="35"/>
+	<checkbox name="farvesynstest.diagnostic.35.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="d35"/>
+	<lineedit name="farvesynstest.diagnostic.35" value="" regexp="\d{1,2}"/>
+      </frame>
+      <frame layout="vbox">
+	<label caption="96"/>
+	<checkbox name="farvesynstest.diagnostic.96.checkbox" caption="Korrekt" truevalue="correct" falsevalue="wrong" script="d96"/>
+	<lineedit name="farvesynstest.diagnostic.96" value="" regexp="\d{1,2}"/>
+      </frame>
+    </frame>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </widgets>
+</macro>
diff --git a/server/xml/macros/ref_behandling-oejendrypning-1.0.xml b/server/xml/macros/ref_behandling-oejendrypning-1.0.xml
new file mode 100644
index 0000000..d2a91fc
--- /dev/null
+++ b/server/xml/macros/ref_behandling-oejendrypning-1.0.xml
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="ref_behandling-oejendrypning" version="1.0">
+<!-- Jeg er i gang med at lave så den automatisk ved hvad øje der er valgt -->
+  <resume language="lua">
+    out = ''
+    out = out .. 'Øjendrypning (ordinationer første døgn):\n'
+    out = out .. getValue('ref_behandling.oejendrypning.drypperegime') .. " " .. getValue('ref_behandling.oejendrypning.oeje') .. '\n'
+ 
+    return out
+</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <widgets caption="Øjendrypning (ordinationer første døgn)" layout="vbox">
+    <frame layout="hbox">
+      <frame layout="vbox">
+	<label caption="Drypperegime:"/>
+	<label/>
+      </frame>
+      <frame layout="vbox">
+	<altcombobox name="ref_behandling.oejendrypning.drypperegime" layout="vbox" value="Ikke udfyldt">
+	  <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
+	  <item caption="Kloramfenikol dr. 0,5% x 4 og Flurolon dr. 1% x 4" value="Kloramfenikol dr. 0,5% x 4 og Flurolon dr. 1% x 4"/>
+	  <item caption="Kloramfenikol salve 0,5% x 4 og Voltaren dr. 0,1% pn max x 4" value="Kloramfenikol salve 0,5% x 4 og Voltaren dr. 0,1% pn max x 4"/>
+	  <item caption="Tobradex dr. x 4" value="Tobradex dr. x 4"/>
+	  <item caption="Kloramfenikol dr. 0,5% x 4" value="Kloramfenikol dr. 0,5% x 4"/>
+	  <altitem caption="Andet" value="andet" layout="hbox" innerwidget="ref_behandling.oejendrypning.drypperegime.andet">
+	    <label caption="Andet:"/>
+	    <lineedit name="ref_behandling.oejendrypning.drypperegime.andet"/>
+	  </altitem>
+	</altcombobox>
+      </frame>
+      <frame layout="vbox">
+	<label caption="Øje:"/>
+	<label/>
+      </frame>
+      <frame layout="vbox">
+	<combobox name="ref_behandling.oejendrypning.oeje" value="">
+	  <item caption="o.dxt" value="o.dxt"/>
+	  <item caption="o.sin" value="o.sin"/>
+	</combobox>
+	<label/>
+      </frame>
+      <frame layout="hbox">
+	<spacer/>
+      </frame>
+    </frame>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </widgets>
+</macro>
diff --git a/server/xml/macros/tao_konklusion-1.0.xml b/server/xml/macros/tao_konklusion-1.0.xml
new file mode 100644
index 0000000..cc5f6a8
--- /dev/null
+++ b/server/xml/macros/tao_konklusion-1.0.xml
@@ -0,0 +1,84 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="tao_konklusion" version="1.0">
+  <resume language="lua">
+    out = ''
+
+    out = out .. 'TAO konklusion:\n'
+
+    if( getValue('tao_konklusion.kommentarer') ~= '' )
+    then
+      out = out .. getValue('tao_konklusion.kommentarer')
+      out = out .. '\n'
+    end
+
+    out = out .. 'Ny kontrol om ' .. getValue('tao_konklusion.kontrol')
+    if( getValue('tao_konklusion.kontrol') == '½' or getValue('tao_konklusion.kontrol') == '1' or getValue('tao_konklusion.kontrol') == '1½' or getValue('tao_konklusion.kontrol') == '2½' or getValue('tao_konklusion.kontrol') == '3½' or getValue('tao_konklusion.kontrol') == '4½' or getValue('tao_konklusion.kontrol') == '5½' or getValue('tao_konklusion.kontrol') == '6½' or getValue('tao_konklusion.kontrol') == '7½' or getValue('tao_konklusion.kontrol') == '8½' or getValue('tao_konklusion.kontrol') == '9½' or getValue('tao_konklusion.kontrol') == '10½' or getValue('tao_konklusion.kontrol') == '11½' )
+    then
+      out = out .. ' måned.\n'
+    else
+      out = out .. ' måneder.\n'
+    end
+
+    out = out .. 'Medicinordination: ' .. getValue('tao_konklusion.ordination') .. '\n'
+
+    return out
+  </resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <widgets caption="TAO konklusion" layout="vbox">
+
+    <frame layout="vbox">
+      <label caption="Kommentarer:"/>
+      <textedit name="tao_konklusion.kommentarer"/>
+      <frame layout="hbox">
+	<label caption="Ny kontrol om"/>
+	<combobox name="tao_konklusion.kontrol" value="">
+	  <item caption="½" value="½"/>
+	  <item caption="1" value="1"/>
+	  <item caption="1½" value="1½"/>
+	  <item caption="2" value="2"/>
+	  <item caption="2½" value="2½"/>
+	  <item caption="3" value="3"/>
+	  <item caption="3½" value="3½"/>
+	  <item caption="4" value="4"/>
+	  <item caption="4½" value="4½"/>
+	  <item caption="5" value="5"/>
+	  <item caption="5½" value="5½"/>
+	  <item caption="6" value="6"/>
+	  <item caption="6½" value="6½"/>
+	  <item caption="7" value="7"/>
+	  <item caption="7½" value="7½"/>
+	  <item caption="8" value="8"/>
+	  <item caption="8½" value="8½"/>
+	  <item caption="9" value="9"/>
+	  <item caption="9½" value="9½"/>
+	  <item caption="10" value="10"/>
+	  <item caption="10½" value="10½"/>
+	  <item caption="11" value="11"/>
+	  <item caption="11½" value="11½"/>
+	  <item caption="12" value="12"/>
+	</combobox>
+	<label caption="måned(er)"/>
+	<spacer/>
+      </frame>
+      <frame layout="hbox">
+	<label caption="Medicinordination:"/>
+	<combobox name="tao_konklusion.ordination" value="Viskøse øjendråber p.n.">
+	  <item caption="Ingen" value="Ingen"/>
+	  <item caption="Viskøse øjendråber p.n." value="Viskøse øjendråber p.n."/>
+	</combobox>
+	<spacer/>
+      </frame>
+    </frame>
+    
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </widgets>
+</macro>