4 files changed, 100 insertions, 10 deletions
diff --git a/server/xml/macros/B.1.4.xml b/server/xml/macros/B.1.4.xml
new file mode 100644
index 0000000..114e1c4
--- /dev/null
+++ b/server/xml/macros/B.1.4.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="B.1.4" version="1.0">
+  <resume>Subjektivt er symptomerne ${amd.subjective_evaluation}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Anamnese (B.1.4)"
+          layout="vbox">
+
+    <label caption="Subjektivt er symptomerne:"/>
+
+    <combobox name="amd.subjective_evaluation" value="">
+      <item caption="Bedret" value="bedret"/>
+      <item caption="Uændret" value="uændret"/>
+      <item caption="Værret" value="værret"/>
+    </combobox>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.10.4.xml b/server/xml/macros/B.2.10.4.xml
new file mode 100644
index 0000000..c9cd1fa
--- /dev/null
+++ b/server/xml/macros/B.2.10.4.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="B.2.10.4" version="1.0">
+  <resume>${amd.indication}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <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”
+-->
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.5.xml b/server/xml/macros/B.2.5.xml
new file mode 100644
index 0000000..8509dfe
--- /dev/null
+++ b/server/xml/macros/B.2.5.xml
@@ -0,0 +1,43 @@
+<?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>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Vurdering af fundus (B.2.5)"
+          layout="vbox">
+
+    <combobox>
+      <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”
+-->
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/templates/amd_kontrolunders.xml b/server/xml/templates/amd_kontrolunders.xml
index 906d66c..8b6560a 100644
--- a/server/xml/templates/amd_kontrolunders.xml
+++ b/server/xml/templates/amd_kontrolunders.xml
@@ -5,13 +5,8 @@
   <macro header="Anamnese"/>
   <macro name="B.1.1"/>
   <macro name="B.1.2" compact="true"/>
+  <macro name="B.1.4"/>
   <macro name="B.2.1.3"/>
-<!--
-  <macro name="B.1.3"/>
-  <macro name="B.2.1.1"/>
-  <macro name="B.2.1.2"/>
-  <macro name="B.2.1.3"/>
--->
 
   <macro header="Objektiv undersøgelse"/>
   <macro name="B.2.2.1"/>
@@ -25,19 +20,19 @@
   <macro name="B.2.2.7"/>
   <macro name="B.2.2.8"/>
 
+  <macro name="B.2.5"/>
+
   <macro header="Øjendrypning"/>
   <macro name="B.2.3"/>
 
   <macro header="Fluorescens angiografi"/>
-<!--
-  <macro name="B.2.7.1"/>
--->
+
   <macro name="B.2.7.2"/>
   <macro name="B.2.7.3"/>
 
   <macro header="Information og samtykke"/>
   <macro name="B.2.10.1"/>
-  <macro name="B.2.10.2"/>
+  <macro name="B.2.10.4"/>
   <macro name="B.2.10.3" compact="true"/>
 
 </course>