From 1bce9e4ebb9521c26fdbc586d4eadd6f2a52b618 Mon Sep 17 00:00:00 2001
From: bertho <bertho>
Date: Wed, 4 Feb 2009 11:26:58 +0000
Subject: Add macros and templates to repository

---
 server/xml/macros/B.0.xml               |  42 ++++
 server/xml/macros/B.1.1.xml             | 113 +++++++++
 server/xml/macros/B.1.2.xml             |  78 ++++++
 server/xml/macros/B.1.3.xml             |  36 +++
 server/xml/macros/B.2.1.1.xml           |  38 +++
 server/xml/macros/B.2.1.2.xml           |  52 ++++
 server/xml/macros/B.2.1.3.xml           |  80 ++++++
 server/xml/macros/B.2.10.1.xml          |  41 ++++
 server/xml/macros/B.2.10.2.xml          |  33 +++
 server/xml/macros/B.2.10.3.xml          |  37 +++
 server/xml/macros/B.2.2.1.xml           | 423 ++++++++++++++++++++++++++++++++
 server/xml/macros/B.2.2.2.xml           | 267 ++++++++++++++++++++
 server/xml/macros/B.2.2.3.xml           | 115 +++++++++
 server/xml/macros/B.2.2.4.1.xml         |  54 ++++
 server/xml/macros/B.2.2.4.2.xml         |  76 ++++++
 server/xml/macros/B.2.2.5.xml           |  72 ++++++
 server/xml/macros/B.2.2.6.xml           |  85 +++++++
 server/xml/macros/B.2.2.7.xml           |  93 +++++++
 server/xml/macros/B.2.2.8.xml           |  48 ++++
 server/xml/macros/B.2.3.xml             |  67 +++++
 server/xml/macros/B.2.7.1.xml           |  31 +++
 server/xml/macros/B.2.7.2.xml           |  49 ++++
 server/xml/macros/B.2.7.3.xml           |  90 +++++++
 server/xml/macros/B.3.1.1.xml           |  23 ++
 server/xml/macros/B.3.1.2.xml           |  28 +++
 server/xml/macros/B.3.1.3.xml           |  31 +++
 server/xml/macros/test_altcombobox.xml  |  28 +++
 server/xml/macros/test_button.xml       |  24 ++
 server/xml/macros/test_checkbox.xml     |  23 ++
 server/xml/macros/test_combobox.xml     |  40 +++
 server/xml/macros/test_dbwidget.xml     |  27 ++
 server/xml/macros/test_lineedit.xml     |  28 +++
 server/xml/macros/test_listbox.xml      |  26 ++
 server/xml/macros/test_meta.xml         |  38 +++
 server/xml/macros/test_metawidget.xml   |  29 +++
 server/xml/macros/test_multilist.xml    |  23 ++
 server/xml/macros/test_radiobuttons.xml |  25 ++
 server/xml/macros/test_resume.xml       |  36 +++
 server/xml/templates/amd_forunders.xml  |  38 +++
 server/xml/templates/test.xml           |  14 ++
 40 files changed, 2501 insertions(+)
 create mode 100644 server/xml/macros/B.0.xml
 create mode 100644 server/xml/macros/B.1.1.xml
 create mode 100644 server/xml/macros/B.1.2.xml
 create mode 100644 server/xml/macros/B.1.3.xml
 create mode 100644 server/xml/macros/B.2.1.1.xml
 create mode 100644 server/xml/macros/B.2.1.2.xml
 create mode 100644 server/xml/macros/B.2.1.3.xml
 create mode 100644 server/xml/macros/B.2.10.1.xml
 create mode 100644 server/xml/macros/B.2.10.2.xml
 create mode 100644 server/xml/macros/B.2.10.3.xml
 create mode 100644 server/xml/macros/B.2.2.1.xml
 create mode 100644 server/xml/macros/B.2.2.2.xml
 create mode 100644 server/xml/macros/B.2.2.3.xml
 create mode 100644 server/xml/macros/B.2.2.4.1.xml
 create mode 100644 server/xml/macros/B.2.2.4.2.xml
 create mode 100644 server/xml/macros/B.2.2.5.xml
 create mode 100644 server/xml/macros/B.2.2.6.xml
 create mode 100644 server/xml/macros/B.2.2.7.xml
 create mode 100644 server/xml/macros/B.2.2.8.xml
 create mode 100644 server/xml/macros/B.2.3.xml
 create mode 100644 server/xml/macros/B.2.7.1.xml
 create mode 100644 server/xml/macros/B.2.7.2.xml
 create mode 100644 server/xml/macros/B.2.7.3.xml
 create mode 100644 server/xml/macros/B.3.1.1.xml
 create mode 100644 server/xml/macros/B.3.1.2.xml
 create mode 100644 server/xml/macros/B.3.1.3.xml
 create mode 100644 server/xml/macros/test_altcombobox.xml
 create mode 100644 server/xml/macros/test_button.xml
 create mode 100644 server/xml/macros/test_checkbox.xml
 create mode 100644 server/xml/macros/test_combobox.xml
 create mode 100644 server/xml/macros/test_dbwidget.xml
 create mode 100644 server/xml/macros/test_lineedit.xml
 create mode 100644 server/xml/macros/test_listbox.xml
 create mode 100644 server/xml/macros/test_meta.xml
 create mode 100644 server/xml/macros/test_metawidget.xml
 create mode 100644 server/xml/macros/test_multilist.xml
 create mode 100644 server/xml/macros/test_radiobuttons.xml
 create mode 100644 server/xml/macros/test_resume.xml
 create mode 100644 server/xml/templates/amd_forunders.xml
 create mode 100644 server/xml/templates/test.xml

diff --git a/server/xml/macros/B.0.xml b/server/xml/macros/B.0.xml
new file mode 100644
index 0000000..f2b3e68
--- /dev/null
+++ b/server/xml/macros/B.0.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="B.0" version="1.0">
+  <resume store_in_journal="false"/>
+  <queries>
+    <query service="pentominos" class="cpr" ttl="1000000"/>
+    <query service="pentominos" class="referral" ttl="1000000"/>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Patient informationer (B.0)"
+          layout="hbox">
+
+    <!-- Patient info -->
+    <frame layout="vbox">
+      <frame layout="hbox">
+        <label caption="Navn:" width="50"/>
+        <lineedit name="name" map="cpr.name" value="Patienten kunne ikke findes" readonly="true"/>
+      </frame>
+      <frame layout="hbox">
+        <label caption="Cpr-nr:" width="50"/>
+        <lineedit name="cpr" map="cpr.cpr" value="-" readonly="true"/>
+      </frame>
+    </frame>
+
+    <!-- Henvisnings info -->
+    <frame layout="vbox">
+      <frame layout="hbox">
+        <label width="100" caption="Henvisende læge:"/>
+        <lineedit name="referral.doctor" map="henvisning.doctor" value="Henvisnings informationer kunne ikke findes" readonly="true"/>
+      </frame>
+      <frame layout="hbox">
+        <label width="100" caption="Henvisningskode:"/>
+        <lineedit name="referral.diagnosecode" map="henvisning.code" value="-" readonly="true"/>
+        <label width="60" caption="Diagnose:"/>
+        <lineedit width="200" name="referral.diagnose" map="henvisning.diagnose" value="-" readonly="true"/>
+      </frame>
+    </frame>
+
+  </window>
+</macro>
diff --git a/server/xml/macros/B.1.1.xml b/server/xml/macros/B.1.1.xml
new file mode 100644
index 0000000..a9eb9f8
--- /dev/null
+++ b/server/xml/macros/B.1.1.xml
@@ -0,0 +1,113 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081202: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    Alt tekst ændret.
+    Layout af multilist input er ændret så det er liniebaseret.
+  -->
+<macro name="B.1.1" version="1.0">
+  <resume>Allergier:
+${cave}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Allergier (B.1.1)"
+          layout="vbox">
+
+    <frame layout="vbox" help="Der anføres allergi eller intolerance for medicin, konserveringsmidler, iod eller andre emner, som man kunne blive udsat for i forbindelse med diagnostik, pleje og behandling på øjenafdelingen.\nDer anføres IKKE høfeber og hududslæt som følge af pollen, husdyr, fødemidler, rengøringsmidler, kosmetik etc. eller kendte medicinbivirkninger, f.eks. nyresten og prikken i fingrene som reaktion på acetazolamid.\nSåfremt der ikke findes nogen allergier som falder under punkt a) anføres: Allergier: Ingen kendte.\nSåfremt man ikke finder en relevant allergi i menuen indhentes linien ”Andet”, den relevante allergi skrives i journalen, og der lægges note til administrator, som vil indføje den ikke kendte allergiårsag blandt standardmulighederne. Der skal i journalteksten altid foreligge oplysning om hvordan en allergi eller intolerance ytrer sig, f.eks. ”hududslæt, konjunktivitis, anafylaktisk shock”">
+
+      <altcombobox name="cave"
+		   layout="vbox"
+		   value="Ingen kendte"
+		   type="select">
+	<altitem caption="Anfør liste" value="list" innerwidget="cave_multilist">
+
+	  <frame caption="Søg og tilføj" layout="vbox">
+
+	    <multilist layout="vbox" name="cave_multilist" innerwidget="cave_metawidget">
+      	      
+	      <metawidget name="cave_metawidget" layout="hbox"
+			  format="${prep} ${reak}.">
+
+		<frame layout="vbox">
+		  <label caption="Præparat:"/>
+		  <altcombobox name="prep" width="100" layout="vbox"
+			       type="search" value="" regexp=".+">
+		    <item caption="Indtast præparat" value=""/>
+		    <item caption="Alphagan" value="Alphagan"/>
+		    <item caption="Atacant" value="Atacant"/>
+		    <item caption="Azopt" value="Azopt"/>
+		    <item caption="Diazepam, (stesolid)" value="Diazepam, (stesolid)"/>
+		    <item caption="Erythromycin" value="Erythromycin"/>
+		    <item caption="Fluorescein" value="Fluorescein"/>
+		    <item caption="Ibuprofen (Mavesår)" value="Ibuprofen (Mavesår)"/>
+		    <item caption="Iod" value="Iod"/>
+		    <item caption="Konserveringsmiddel" value="Konserveringsmiddel"/>
+		    <item caption="Lumigan" value="Lumigan"/>
+		    <item caption="Penicillin" value="Penicillin"/>
+		    <item caption="Plaster" value="Plaster"/>
+		    <item caption="Sulfopræparater" value="Sulfopræparater"/>
+		    <item caption="Timolol" value="Timolol"/>
+		    <item caption="Travatan" value="Travatan"/>
+		    <item caption="Tropicamide" value="Tropicamide"/>
+		    <item caption="Trusopt" value="Trusopt"/>
+		    <item caption="Xalatan" value="Xalatan"/>
+		    <altitem caption="Andet" value="andet" innerwidget="prep_andet">
+		      <frame layout="hbox">
+			<label caption="Indtast:"/>
+			<lineedit name="prep_andet"/>
+		      </frame>
+		    </altitem>
+		  </altcombobox>
+		</frame>
+
+		<frame layout="vbox">
+		  <label caption=""/>
+		  <label caption="giver"/>
+		  <label caption=""/>
+		</frame>
+
+		<frame layout="vbox">
+		  <label caption="Reaktion:"/>
+		  <altcombobox name="reak" width="100" layout="vbox"
+			       type="select" value="" regexp=".+">
+		    <item caption="Vælg reaktion" value=""/>
+		    <item caption="hududslæt" value="giver hududslæt"/>
+		    <item caption="konjunktivitis" value="giver konjunktivitis"/>
+		    <item caption="anafylaktisk shock" value="giver anafylaktisk chock"/>
+		    <altitem caption="Andet" value="andet" innerwidget="reak_andet">
+		      <frame name="frame_reak_andet" layout="hbox">
+			<label caption="Indtast:"/>
+			<lineedit name="reak_andet"/>
+		      </frame>
+		    </altitem>
+		  </altcombobox>
+		</frame>
+	
+		<spacer/>
+
+	      </metawidget>
+	      
+	    </multilist>
+	    
+	    </frame>
+	</altitem>
+	<item caption="Ingen kendte" value="Ingen kendte"/>
+	  
+      </altcombobox>
+	
+    </frame>
+      
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.1.2.xml b/server/xml/macros/B.1.2.xml
new file mode 100644
index 0000000..9c8b3e5
--- /dev/null
+++ b/server/xml/macros/B.1.2.xml
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081202: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    Alt tekst ændret.
+    Layout af multilist input er ændret så det er liniebaseret.
+  -->
+<macro name="B.1.2" version="1.0">
+  <resume>Medicin:
+${medicin}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Medicin (B.1.2)"
+          layout="vbox">
+
+    <frame layout="vbox" help="For ambulante patienter noteres de typer og den dosering af medicin, som foreligger oplyst og som har relevans for sygdomsforløbet. Der kan refereres til indskannet medicinliste, såfremt denne er dækkende og læselig.\nFor indlagte patienter noteres detaljeret medicinanamnese med præparatnavn og dosering.">
+
+	<altcombobox name="medicin" layout="vbox" width="200" value="Intet dagligt forbrug." type="select">
+	  <item caption="Intet dagligt forbrug" value="Intet dagligt forbrug."/>
+	  <item caption="Se indscannet samtykkeskema" value="Se indscannet samtykkeskema."/>
+	  <altitem caption="Anfør liste" value="list" innerwidget="medicin_list">
+	    <frame name="frame_medicin_list" caption="Søg og tilføj" layout="vbox">
+	      <multilist name="medicin_list" layout="vbox"
+      			 innerwidget="medicin_list_entry">
+		
+		<metawidget name="medicin_list_entry" layout="hbox" format="${prep} x ${dosis}${eye}">
+		  <frame layout="vbox">
+		    <label caption="Præparat:"/>
+		    <dbwidget name="prep" driver="QPSQL" server="sensei.j.auh.dk" user="postgres" database="lms"
+			      select="drugname, dosageform_code, strength_text"
+			      from="lms01"
+			      where="drugname || ' ' || strength_text || ' (' || dosageform_code || ')'"
+			      format="${drugname} ${strength_text} (${dosageform_code})"
+			      width="250"/>
+		  </frame>
+
+		  <frame layout="vbox">
+		    <label caption=""/>
+		    <label caption=" x "/>
+		  </frame>
+
+		  <frame layout="vbox">
+		    <label caption="Dosis:" />
+		    <lineedit name="dosis" width="75"/>
+		  </frame>
+
+		  <frame layout="vbox">
+		    <label caption="Øje:"/>
+		    <radiobuttons name="eye" value="" layout="hbox">
+		      <radiobutton caption="Ingen" value=""/>
+		      <radiobutton caption="o.dxt" value=" o.dxt"/>
+		      <radiobutton caption="o.sin" value=" o.sin"/>
+		      <radiobutton caption="o.u" value=" o.u"/>
+		    </radiobuttons>
+		  </frame>
+
+		</metawidget>
+	      </multilist>
+	    </frame>
+	  </altitem>
+	</altcombobox>
+      
+    </frame>
+    
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.1.3.xml b/server/xml/macros/B.1.3.xml
new file mode 100644
index 0000000..df1e47f
--- /dev/null
+++ b/server/xml/macros/B.1.3.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081202: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    Alt tekst ændret.
+  -->
+<macro name="B.1.3" version="1.0">
+  <resume>Tidligere alment:
+${previous_common_diseases}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Tidligere alment (B.1.3)"
+          layout="vbox">
+
+    <altcombobox name="previous_common_diseases" layout="vbox" value="Intet relevant">
+      <item caption="Intet relevant" value="Intet relevant"/>
+      <altitem caption="Anfør detaljer" value="detaljer" innerwidget="detaljer" layout="vbox">
+	<label caption="Udfyld detaljer:"/>
+	<textedit name="detaljer" help="Anfør tidligere almene sygdomme, som skønnes at have relevans for aktuelle."/>
+      </altitem>
+    </altcombobox>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.1.1.xml b/server/xml/macros/B.2.1.1.xml
new file mode 100644
index 0000000..0171cc7
--- /dev/null
+++ b/server/xml/macros/B.2.1.1.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081202: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<macro name="B.2.1.1" version="1.0">
+  <resume>Tobaksrygning:
+${tobacco}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Tobaksrygning (B.2.1.1)"
+          layout="vbox">
+
+    <altcombobox name="tobacco" value="Har aldrig røget" layout="vbox"
+		 help="En enhed kan være cigaret, cerut, cigar, pibestop eller tilsvarende.">
+      <item caption="Har aldrig røget" value="Har aldrig røget"/>
+      <item caption="Har røget tidligere" value="Har røget tidligere"/>
+      <item caption="1-5 enheder dgl" value="1-5 enheder dgl"/>
+      <item caption="5-20 enheder dgl" value="5-20 enheder dgl"/>
+      <item caption="> 20 enheder dgl" value="> 20 enheder dgl"/>
+      <altitem caption="Andet" value="andet" innerwidget="tobak_andet">
+	<frame layout="hbox">
+	  <label caption="Andet:"/>
+	  <lineedit name="tobak_andet"/>
+	</frame>
+      </altitem>
+    </altcombobox>
+		
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.1.2.xml b/server/xml/macros/B.2.1.2.xml
new file mode 100644
index 0000000..9a7b12c
--- /dev/null
+++ b/server/xml/macros/B.2.1.2.xml
@@ -0,0 +1,52 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081203: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    'Alternativ' tekst ændret.
+  -->
+<!--
+    20090103: Bent Bisballe Nyeng
+    Tilføjede "manglende øje" felter.
+  -->
+<macro name="B.2.1.2" version="1.0">
+  <resume>Tidligere øjensygdomme:
+${previous_eye_diseases}
+${missing_eye_right}
+${missing_eye_left}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Tidligere øjensygdomme (B.2.1.2)"
+          layout="vbox">
+
+    <altcombobox name="previous_eye_diseases" value="Ingen relevante" layout="vbox">
+      <item caption="Ingen relevante" value="Ingen relevante"/>
+      <altitem caption="Anfør detaljer" value="detaljer" innerwidget="detaljer" layout="vbox">
+	<label caption="Udfyld detaljer:"/>
+	<textedit name="detaljer" help="Anfør tidligere øjensygdomme, som har relevans for aktuelle."/>
+      </altitem>
+    </altcombobox>
+    
+    <frame layout="hbox" caption="Specifikt for det videre forløb">
+      <frame layout="hbox">
+	  <checkbox caption="Intet højre øje."
+		    name="missing_eye_right"
+		    truevalue="Intet højre øje." falsevalue="" value=""/>
+	  <checkbox caption="Intet venstre øje."
+		    name="missing_eye_left"
+		    truevalue="Intet venstre øje." falsevalue="" value=""/>
+      </frame>
+    </frame>
+
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.1.3.xml b/server/xml/macros/B.2.1.3.xml
new file mode 100644
index 0000000..58dab94
--- /dev/null
+++ b/server/xml/macros/B.2.1.3.xml
@@ -0,0 +1,80 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081203: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    Alt tekst ændret.
+    Layout af multilist input er ændret så det er liniebaseret.
+  -->
+<macro name="B.2.1.3" version="1.0">
+  <resume>Aktuelle:
+${current_eye_disease}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Aktuelle (B.2.1.3)"
+          layout="vbox">
+
+    <multilist name="current_eye_disease" value=""
+	       innerwidget="aktuelle_entry">
+      
+	<metawidget name="aktuelle_entry" layout="hbox"
+		    format="På ${eye} øje er der observeret ${observeret}. Symptomerne er opstået ${when} og er efterfølgende ${then}">
+
+	  <frame layout="vbox">
+	    <label caption="Aktuelt øje:"/>
+	    <radiobuttons name="eye" value="." layout="hbox">
+	      <radiobutton caption="o.dxt" value="højre"/>
+	      <radiobutton caption="o.sin" value="venstre"/>
+	    </radiobuttons>
+	    <label caption=""/>
+	  </frame>
+
+	  <frame layout="vbox">
+	    <label caption="Observeret:"/>
+	    <altcombobox name="observeret" layout="vbox" value="mørk plet i synsfeltet">
+	      <item caption="Mørk plet i synsfeltet" value="mørk plet i synsfeltet"/>
+	      <item caption="Metamorfopsier" value="metamorfopsier"/>
+	      <item caption="Mikropsi" value="mikropsier"/>
+	      <item caption="Dyskromatopsi" value="dyskromatopsi"/>
+	      <altitem caption="Andet" value="andet" layout="hbox" innerwidget="andet">
+		<label caption="Andet:"/>
+		<lineedit name="andet" value=""/>
+	      </altitem>
+	    </altcombobox>
+	  </frame>
+
+	  <frame layout="vbox">
+	    <label caption="Opstået:"/>
+	    <radiobuttons name="when" value="." layout="hbox">
+	      <radiobutton caption="Pludseligt" value="pludseligt"/>
+	      <radiobutton caption="Gradvist" value="gradvist"/>
+	    </radiobuttons>
+	    <label caption=""/>
+	  </frame>
+
+	  <frame layout="vbox">
+	    <label caption="Efterfølgende:"/>
+	    <combobox name="then" value="uændret.">
+	      <item caption="Uændret" value="uændret."/>
+	      <item caption="Forværret" value="forværret."/>
+	      <item caption="Forbedret" value="forbedret."/>
+	    </combobox>
+	    <label caption=""/>
+	  </frame>
+
+	</metawidget>
+
+      </multilist>
+  
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.10.1.xml b/server/xml/macros/B.2.10.1.xml
new file mode 100644
index 0000000..aaf3c37
--- /dev/null
+++ b/server/xml/macros/B.2.10.1.xml
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081202: Lars Bisballe Jensen
+    Ændret til nyt format i resume og naming scheme.
+
+    20081203: Bent Bisballe Nyeng
+    LUA script til validering af checkbox, så den ikke bliver godkendt
+    hvis den ikke er aktiveret.
+  -->
+<macro name="B.2.10.1" version="1.0">
+  <resume>${amd.information}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+    <script language="lua" name="check">
+      if(value == '')
+      then
+        return false
+      end
+      return true
+    </script>
+  </scripts>
+  <window caption="Information (B.2.10.1)"
+          layout="vbox">
+
+    <frame layout="hbox">
+      <checkbox name="amd.information" script="check"
+		truevalue="Der er udleveret informationsfolder."
+		falsevalue=""
+		caption="Der er udleveret informationsfolder"/>
+    </frame>
+
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.10.2.xml b/server/xml/macros/B.2.10.2.xml
new file mode 100644
index 0000000..74ba278
--- /dev/null
+++ b/server/xml/macros/B.2.10.2.xml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081202: Lars Bisballe Jensen
+    Ændret til nyt format i resume og naming scheme.
+  -->
+<macro name="B.2.10.2" version="1.0">
+  <resume>${amd.indication}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Behandlingsindikation (B.2.10.2)"
+          layout="vbox">
+
+    <frame layout="vbox">
+      <label caption="Der findes indikation for:"/>
+      <combobox name="amd.indication" value="">
+	<item caption="PDT" value="Der findes indikation for PDT behandling."/>
+	<item caption="Argon laser" value="Der findes indikation for argon laser behandling."/>
+	<item caption="Intravitreal angiostatisk behandling" value="Der findes indikation for intravitreal angiostatisk behandling."/>
+	<item caption="Ingen behandlingsindikation" value="Der findes ikke indikation for behandling."/>
+      </combobox>
+    </frame>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.10.3.xml b/server/xml/macros/B.2.10.3.xml
new file mode 100644
index 0000000..e82f2c0
--- /dev/null
+++ b/server/xml/macros/B.2.10.3.xml
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081202: Lars Bisballe Jensen
+    Ændret til nyt format i resume og naming scheme.
+  -->
+<macro name="B.2.10.3" version="1.0">
+  <resume>Der informeres om, at behandlingen har til formål at hæmme væksten af de nye blodkar under nethinden. Behandlingen foregår ved en injektion i øjet i lokalbedøvelse, og der kræves månedlig kontrol for at vurdere om behandlingen skal gentages. Der informeres endvidere om at der er en lille risiko for infektion og trykstigning i øjet, mens andre komplikationer er yderst sjældne. På baggrund af informationen giver patienten sit samtykke til behandlingen.
+
+Der er givet informeret samtykke, ${amd.consent}.</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+    <script language="lua" name="check">
+      if(value == '')
+      then
+        return false
+      end
+      return true
+    </script>
+  </scripts>
+  <window caption="Informeret samtykke (B.2.10.3)"
+          layout="vbox">
+
+    <label height="80" caption="Der informeres om, at behandlingen har til formål at hæmme væksten af de nye blodkar under nethinden. Behandlingen foregår ved en injektion i øjet i lokalbedøvelse, og der kræves månedlig kontrol for at vurdere om behandlingen skal gentages. Der informeres endvidere om at der er en lille risiko for infektion og trykstigning i øjet, mens andre komplikationer er yderst sjældne. På baggrund af informationen giver patienten sit samtykke til behandlingen."/>
+    <checkbox caption="Der er givet informeret samtykke."
+	      name="amd.consent" value="" truevalue="JA"
+	      falsevalue="" script="check"/>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.2.1.xml b/server/xml/macros/B.2.2.1.xml
new file mode 100644
index 0000000..f0445d7
--- /dev/null
+++ b/server/xml/macros/B.2.2.1.xml
@@ -0,0 +1,423 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081203: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    Højre/venstre byttet om.
+  -->
+<!--
+    20090202: Bent Bisballe Nyeng
+    'missing eye' tilføjet.
+  -->
+<macro name="B.2.2.1" version="1.0">
+  <resume language="lua">
+    out = ''
+    if ( getValue('snellen.right.missing') == '' or getValue('snellen.left.missing') == '' )
+    then
+      out = out ..'               Snellen ETDRS\n'
+      if ( getValue('snellen.right.missing') == '' )
+      then
+        out = out..'Syn højre øje:   '..getValue('snellen.right')..'     '..getValue('etdrs.right')..'\n'
+      end
+      if ( getValue('snellen.left.missing') == '' )
+      then
+        out = out..'Syn venstre øje: '..getValue('snellen.left')..'     '..getValue('etdrs.left')..'\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 = '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="not0">
+      if(value == 'Ikke udfyldt')
+      then
+        return false
+      end
+      return true
+    </script>
+    <script language="lua" name="right_eye">
+      if ( value == 'mangler' )
+      then
+        disable('right_eye_frame')
+      else
+        enable('right_eye_frame')
+      end
+      return true
+    </script>
+    <script language="lua" name="left_eye">
+      if ( value == 'mangler' )
+      then
+        disable('left_eye_frame')
+      else
+        enable('left_eye_frame')
+      end
+      return true
+    </script>
+  </scripts>
+  <window caption="Visus (B.2.2.1)"
+          layout="vbox">
+
+    <frame layout="hbox">
+      
+      <!-- Højre øje -->
+      <frame layout="vbox">
+	<checkbox caption="Der kan ikke måles på højre øje"
+		  name="snellen.right.missing" script="right_eye"
+		  map="missing_eye_right_map"
+		  truevalue="mangler" falsevalue="" value=""/>
+	<frame name="right_eye_frame" caption="Højre øje" layout="hbox">
+	  
+	  <frame layout="vbox">
+	    <label caption="Snellen:"/>
+	    <altcombobox name="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="etdrs.right" value="Ikke udfyldt" type="search" script="not0">
+	      <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
+	      <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>
+
+      <!-- Venstre øje -->
+      <frame layout="vbox">
+	<checkbox caption="Der kan ikke måles på venstre øje"
+		  name="snellen.left.missing" script="left_eye"
+		  map="missing_eye_left_map"
+		  truevalue="mangler" falsevalue="" value=""/>
+	<frame name="left_eye_frame" caption="Venstre øje" layout="hbox">
+	  
+	  <frame layout="vbox">
+	    <label caption="Snellen:"/>
+	    <altcombobox name="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="venstre_snellen_andet" layout="hbox">
+		<label caption="Andet:"/>
+		<lineedit name="venstre_snellen_andet" regexp="[0-9]+(,\d+|\d*)"/>
+	      </altitem>
+	    </altcombobox>
+	  </frame>
+	  <frame layout="vbox">
+	    <label caption="ETDRS:"/>
+	    <combobox name="etdrs.left" value="Ikke udfyldt" type="search" script="not0">
+	      <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
+	      <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>
+
+    </frame>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.2.2.xml b/server/xml/macros/B.2.2.2.xml
new file mode 100644
index 0000000..70304dd
--- /dev/null
+++ b/server/xml/macros/B.2.2.2.xml
@@ -0,0 +1,267 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081203: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    Højre/venstre byttet om.
+  -->
+<!--
+    20090202: Bent Bisballe Nyeng
+    'missing eye' tilføjet.
+  -->
+<macro name="B.2.2.2" version="1.0">
+  <resume language="lua">
+    out = ''
+    if ( getValue('lensmeter.right.missing') == '' )
+    then
+      out = out .. 'Egen brille højre øje: ' .. getValue('lensmeter.right.sphere')
+        .. ' sf, ' .. getValue('lensmeter.right.cyl') .. ' cyl ' 
+        .. getValue('lensmeter.right.axis') .. ' grader.'
+    end
+
+    if ( getValue('lensmeter.left.missing') == '' )
+    then
+      out = out .. 'Egen brille venstre øje: ' .. getValue('lensmeter.left.sphere')
+        .. ' sf, ' .. gteValue('lensmeter.left.cyl') .. ' cyl '
+        .. getValue('lensmeter.left.axis') .. ' grader.'
+    end
+
+    return out
+  </resume>
+  <queries>
+    <query class="lensmeter" ttl="100000"/>
+    <query service="pracro" class="missing_eye_right" ttl="1000000"/>
+    <query service="pracro" class="missing_eye_left" ttl="1000000"/>
+  </queries>
+  <maps>
+    <map name="missing_eye_right_map">
+      value = 0
+      timestamp = 0
+      source = 'pracro'
+
+      if( missing_eye_right )
+      then
+        if( missing_eye_right.value and missing_eye_right.value == '' )
+        then
+          value = ''
+          timestamp = missing_eye_right.timestamp
+        else
+          value = 'mangler'
+          timestamp = missing_eye_right.timestamp
+        end
+      end
+      return value, timestamp, source
+    </map>
+    <map name="missing_eye_left_map">
+      value = 0
+      timestamp = 0
+      source = 'pracro'
+      
+      if( missing_eye_left )
+      then
+        if( missing_eye_left.value and missing_eye_left.value == '' )
+        then
+          value = ''
+          timestamp = missing_eye_left.timestamp
+        else
+          value = 'mangler'
+          timestamp = missing_eye_left.timestamp
+        end
+      end
+      return value, timestamp, source
+    </map>
+    <map name="lensmeter.left.sphere">
+      -- Returning 0, 0 invalidates the result
+      value = 0
+      timestamp = 0
+      source = 0
+
+      if(lensmeter and lensmeter.left and lensmeter.left.sphere and lensmeter.left.sphere.value and lensmeter.left.sphere.timestamp)
+      then
+        value = lensmeter.left.sphere.value
+        -- convert . to ,
+        value = string.gsub(value, '[.]', ',')
+        timestamp = lensmeter.left.sphere.timestamp
+        source = lensmeter.left.sphere.source
+      end
+      return value, timestamp, source
+    </map>
+    <map name="lensmeter.left.cyl">
+      -- Returning 0, 0 invalidates the result
+      value = 0
+      timestamp = 0
+      source = 0
+
+      if(lensmeter and lensmeter.left and lensmeter.left.cyl and lensmeter.left.cyl.value and lensmeter.left.cyl.timestamp)
+      then
+        value = lensmeter.left.cyl.value
+        -- convert . to ,
+        value = string.gsub(value, '[.]', ',')
+        timestamp = lensmeter.left.cyl.timestamp
+        source = lensmeter.left.cyl.source
+      end
+      return value, timestamp, source
+    </map>
+    <map name="lensmeter.right.sphere">
+      -- Returning 0, 0 invalidates the result
+      value = 0
+      timestamp = 0
+      source = 0
+      
+      if(lensmeter and lensmeter.right and lensmeter.right.sphere and lensmeter.right.sphere.value and lensmeter.right.sphere.timestamp)
+      then
+        value = lensmeter.right.sphere.value
+        -- convert . to ,
+        value = string.gsub(value, '[.]', ',')
+        timestamp = lensmeter.right.sphere.timestamp
+        source = lensmeter.right.sphere.source
+      end
+      return value, timestamp, source
+    </map>
+    <map name="lensmeter.right.cyl">
+      -- Returning 0, 0 invalidates the result
+      value = 0
+      timestamp = 0
+      source = 0
+      
+      if(lensmeter and lensmeter.right and lensmeter.right.cyl and lensmeter.right.cyl.value and lensmeter.right.cyl.timestamp)
+      then
+        value = lensmeter.right.cyl.value
+        -- convert . to ,
+        value = string.gsub(value, '[.]', ',')
+        timestamp = lensmeter.right.cyl.timestamp
+        source = lensmeter.right.cyl.source
+      end
+      return value, timestamp, source
+    </map>
+  </maps>
+  <scripts>
+     <script language="lua" name="lt20gt-25">
+      if(value == '')
+      then
+        return false
+      end
+
+      value = string.gsub(value, ',', '.')
+      if(tonumber(value) &gt;= -25 and tonumber(value) &lt;= 20)
+      then
+        return true
+      else
+        return false
+      end
+    </script>
+    <script language="lua" name="lt10gt-15">
+      if(value == '')
+      then
+        return false
+      end
+
+      value = string.gsub(value, ',', '.')
+      if(tonumber(value) &gt;= -15 and tonumber(value) &lt;= 10)
+      then
+        return true
+      else
+        return false
+      end
+    </script>
+    <script language="lua" name="lt359gt0">
+      if(value == '')
+      then
+        return false
+      end
+
+      value = string.gsub(value, ',', '.')
+      if(tonumber(value) &gt;= 0 and tonumber(value) &lt;= 359)
+      then
+        return true
+      else
+        return false
+      end
+    </script>
+    <script language="lua" name="right_eye">
+      if ( value == 'mangler' )
+      then
+        disable('right_eye_frame')
+      else
+        enable('right_eye_frame')
+      end
+      return true
+    </script>
+    <script language="lua" name="left_eye">
+      if ( value == 'mangler' )
+      then
+        disable('left_eye_frame')
+      else
+        enable('left_eye_frame')
+      end
+      return true
+    </script>
+  </scripts>
+  <window caption="Egen brille (B.2.2.2)"
+          layout="vbox">
+
+    <frame layout="hbox">
+
+      <!-- Højre øje -->
+      <frame layout="vbox">
+        <checkbox caption="Der kan ikke måles på højre øje"
+		  name="lensmeter.right.missing" script="right_eye"
+		  map="missing_eye_right_map"
+		  truevalue="mangler" falsevalue="" value=""/>
+	<frame name="right_eye_frame" caption="Højre øje" layout="hbox">
+	  
+	  <frame layout="vbox">
+	    <label caption="Sf:"/>
+	    <lineedit name="lensmeter.right.sphere" map="lensmeter.right.sphere"
+		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	  </frame>
+	  <frame layout="vbox">
+	    <label caption="Cyl:"/>
+	    <lineedit name="lensmeter.right.cyl" map="lensmeter.right.cyl"
+		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+	  </frame>
+	  <frame layout="vbox">
+	    <label caption="Grader:"/>
+	    <lineedit name="lensmeter.right.axis" map="lensmeter.right.axis"
+		      regexp="[\d]+" script="lt359gt0" value=""/>
+	  </frame>
+	</frame>
+      </frame>
+      
+      <!-- Venstre øje -->
+      <frame layout="vbox">
+	<checkbox caption="Der kan ikke måles på venstre øje"
+		  name="lensmeter.left.missing" script="left_eye"
+		  map="missing_eye_left_map"
+		  truevalue="mangler" falsevalue="" value=""/>
+	<frame name="left_eye_frame" caption="Venstre øje" layout="hbox">
+	  
+	  <frame layout="vbox">
+	    <label caption="Sf:"/>
+	    <lineedit name="lensmeter.left.sphere" map="lensmeter.left.sphere"
+		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	  </frame>
+	  <frame layout="vbox">
+	    <label caption="Cyl:"/>
+	    <lineedit name="lensmeter.left.cyl" map="lensmeter.left.cyl"
+		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+	  </frame>
+	  <frame layout="vbox">
+	    <label caption="Grader:"/>
+	    <lineedit name="lensmeter.left.axis" map="lensmeter.left.axis"
+		      regexp="[\d]+" script="lt359gt0" value=""/>
+	  </frame>
+	</frame>
+      </frame>
+
+    </frame>
+    
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.2.3.xml b/server/xml/macros/B.2.2.3.xml
new file mode 100644
index 0000000..849d80f
--- /dev/null
+++ b/server/xml/macros/B.2.2.3.xml
@@ -0,0 +1,115 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081203: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    Højre/venstre byttet om.
+  -->
+<macro name="B.2.2.3" version="1.0">
+  <resume>Autorefraktion højre øje: ${autorefractor.right.sphere} sf, ${autorefractor.right.cyl} cyl ${autorefractor.right.axis} grader.
+Autorefraktion venstre øje: ${autorefractor.left.sphere} sf, ${autorefractor.left.cyl} cyl ${autorefractor.left.axis} grader.</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+    <script language="lua" name="lt20gt-25">
+      if(value == '')
+      then
+        return false
+      end
+
+      value = string.gsub(value, ',', '.')
+      if(tonumber(value) &gt;= -25 and tonumber(value) &lt;= 20)
+      then
+        return true
+      else
+        return false
+      end
+    </script>
+    <script language="lua" name="lt10gt-15">
+      if(value == '')
+      then
+        return false
+      end
+
+      value = string.gsub(value, ',', '.')
+      if(tonumber(value) &gt;= -15 and tonumber(value) &lt;= 10)
+      then
+        return true
+      else
+        return false
+      end
+    </script>
+    <script language="lua" name="lt359gt0">
+      if(value == '')
+      then
+        return false
+      end
+
+      value = string.gsub(value, ',', '.')
+      if(tonumber(value) &gt;= 0 and tonumber(value) &lt;= 359)
+      then
+        return true
+      else
+        return false
+      end
+    </script>
+  </scripts>
+  <window caption="Autorefraktion (B.2.2.3)"
+          layout="vbox">
+
+    <frame layout="hbox">
+      
+      <!-- Højre øje -->
+      <frame caption="Højre øje" layout="hbox">
+	
+	<frame layout="vbox">
+	  <label caption="Sf:"/>
+	  <lineedit name="autorefractor.right.sphere"
+		    regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	</frame>
+	<frame layout="vbox">
+	  <label caption="Cyl:"/>
+	  <lineedit name="autorefractor.right.cyl"
+		    regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+	</frame>
+	<frame layout="vbox">
+	  <label caption="Grader:"/>
+	  <lineedit name="autorefractor.right.axis"
+		    regexp="[\d]+" script="lt359gt0" value=""/>
+	</frame>
+	
+      </frame>
+
+      <!-- Venstre øje -->
+      <frame caption="Venstre øje" layout="hbox">
+	
+	<frame layout="vbox">
+	  <label caption="Sf:"/>
+	  <lineedit name="autorefractor.left.sphere"
+		    regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	</frame>
+	<frame layout="vbox">
+	  <label caption="Cyl:"/>
+	  <lineedit name="autorefractor.left.cyl"
+		    regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+	</frame>
+	<frame layout="vbox">
+	  <label caption="Grader:"/>
+	  <lineedit name="autorefractor.left.axis"
+		    regexp="[\d]+" script="lt359gt0" value=""/>
+	</frame>
+      </frame>
+
+    </frame>
+    
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.2.4.1.xml b/server/xml/macros/B.2.2.4.1.xml
new file mode 100644
index 0000000..a92cd50
--- /dev/null
+++ b/server/xml/macros/B.2.2.4.1.xml
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081204: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    Højre/venstre byttet om.
+  -->
+<macro name="B.2.2.4.1" version="1.0">
+  <resume></resume>
+  <queries>
+  </queries>
+  <maps>
+  </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>
+  </scripts>
+  <window caption="OCT, u. konklusion (B.2.2.4.1)"
+          layout="vbox">
+
+    <frame layout="hbox">
+      
+      <!-- Højre øje -->
+      <frame caption="Højre øje" layout="hbox">
+	<label caption="Tykkelse:"/>
+	<lineedit name="oct.right.thickness" regexp="\d{1,5}" script="lt10000gt0" value=""/>
+	<label caption="µm"/>
+      </frame>
+
+      <!-- Venstre øje -->
+      <frame caption="Venstre øje" layout="hbox">
+	<label caption="Tykkelse:"/>
+	<lineedit name="oct.left.thickness" regexp="\d{1,5}" script="lt10000gt0" value=""/>
+	<label caption="µm"/>
+      </frame>
+      
+    </frame>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.2.4.2.xml b/server/xml/macros/B.2.2.4.2.xml
new file mode 100644
index 0000000..1de45ea
--- /dev/null
+++ b/server/xml/macros/B.2.2.4.2.xml
@@ -0,0 +1,76 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081204: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    Højre/venstre byttet om.
+  -->
+<macro name="B.2.2.4.2" version="1.0">
+  <resume>Central nethindetykkelse, højre: ${oct.right.thickness} µm, ${oct.right.description}.
+Central nethindetykkelse, venstre: ${oct.left.thickness} µm, ${oct.left.description}.</resume>
+  <queries>
+  </queries>
+  <maps>
+  </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>
+  </scripts>
+  <window caption="OCT, m. konklusion (B.2.2.4.2)"
+          layout="vbox">
+
+    <frame layout="hbox">
+      
+      <!-- Højre øje -->
+      <frame caption="Højre øje" layout="hbox">
+	<label caption="Tykkelse:"/>
+	<lineedit name="oct.right.thickness" regexp="\d{1,5}" script="lt10000gt0" value=""/>
+	<label caption="µm"/>
+	<combobox name="oct.right.description" type="select" value="">
+	  <item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
+	  <item caption="Serøs amotio" value="serøs amotio"/>
+	  <item caption="Cystoidt makulært ødem" value="cystoidt makulært ødem"/>
+	  <item caption="Subretinal udfyldning" value="subretinal udfyldning"/>
+	  <item caption="Retinal traktion" value="retinal traktion"/>
+	  <item caption="Normal" value="normal"/> 
+	</combobox>
+      </frame>
+
+      <!-- Venstre øje -->
+      <frame caption="Venstre øje" layout="hbox">
+	<label caption="Tykkelse:"/>
+	<lineedit name="oct.left.thickness" regexp="\d{1,5}" script="lt10000gt0" value=""/>
+	<label caption="µm"/>
+	<combobox name="oct.left.description" type="select" value="">
+	  <item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
+	  <item caption="Serøs amotio" value="serøs amotio"/>
+	  <item caption="Cystoidt makulært ødem" value="cystoidt makulært ødem"/>
+	  <item caption="Subretinal udfyldning" value="subretinal udfyldning"/>
+	  <item caption="Retinal traktion" value="retinal traktion"/>
+	  <item caption="Normal" value="normal"/> 
+	</combobox>
+      </frame>
+      
+    </frame>
+
+    <frame layout="vbox">
+      <label caption="Kommentarer:"/>
+      <lineedit name="oct.comments" value=""/>
+    </frame>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.2.5.xml b/server/xml/macros/B.2.2.5.xml
new file mode 100644
index 0000000..9199a1c
--- /dev/null
+++ b/server/xml/macros/B.2.2.5.xml
@@ -0,0 +1,72 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081203: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    Højre/venstre byttet om.
+  -->
+<macro name="B.2.2.5" version="1.0">
+  <resume>Øjentryk:
+Højre øje: ${tonometer.pressure.right} mmHg
+Venstre øje: ${tonometer.pressure.right} mmHg
+${tonometer.device}.</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+    <script language="lua" name="lt80gt0">
+      if(value == '')
+      then
+        return false
+      end
+
+      value = string.gsub(value, ',', '.')
+      if(tonumber(value) &gt;= 0 and tonumber(value) &lt;= 80)
+      then
+        return true
+      else
+        return false
+      end
+    </script>
+  </scripts>
+  <window caption="Øjentryk (B.2.2.5)"
+          layout="vbox">
+
+    <frame layout="hbox">
+    
+      <!-- Højre øje -->
+      <frame caption="Højre øje" layout="hbox">
+	<label caption="Tryk:"/>
+	<spacer/>
+	<lineedit name="tonometer.pressure.right" regexp="\d{1,2}" script="lt80gt0" value=""/>
+	<label caption="mmHg"/>
+	<spacer/>
+      </frame>
+
+      <!-- Venstre øje -->
+      <frame caption="Venstre øje" layout="hbox">
+	<label caption="Tryk:"/>
+	<spacer/>
+	<lineedit name="tonometer.pressure.left" regexp="\d{1,2}" script="lt80gt0" value=""/>
+	<label caption="mmHg"/>
+	<spacer/>
+      </frame>
+
+    </frame>
+
+    <label caption="Tonometer måling foretaget med:"/>
+    <combobox name="tonometer.device" value="">
+      <item caption="Applanationstonometer" value="Appl"/>
+      <item caption="Lufttonometer" value="Luft"/>
+    </combobox>
+    
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.2.6.xml b/server/xml/macros/B.2.2.6.xml
new file mode 100644
index 0000000..78c862f
--- /dev/null
+++ b/server/xml/macros/B.2.2.6.xml
@@ -0,0 +1,85 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081204: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    Højre/venstre byttet om.
+  -->
+<macro name="B.2.2.6" version="1.0">
+  <resume store_in_journal="true">Spaltelampe:
+Linsen, højre side: ${slit_lamp.right.observation}
+${slit_lamp.right.additional}
+Linsen, venstre side: ${slit_lamp.left.observation}
+${slit_lamp.left.additional}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Spaltelampe (B.2.2.6)"
+          layout="vbox">
+    
+    <frame layout="hbox">
+
+      <!-- Højre øje -->
+      <frame caption="Højre øje" layout="vbox">
+	<frame layout="hbox">
+	  <frame layout="vbox">
+	    <label caption="Linsen:"/>
+	    <label/>
+	  </frame>
+	  <frame layout="vbox">
+	    <altcombobox name="slit_lamp.right.observation" layout="vbox" value="Ingen katarakt">
+	      <item caption="Ingen katarakt" value="Ingen katarakt"/>
+	      <item caption="Katarakt grad 1" value="Katarakt grad 1"/>
+	      <item caption="Katarakt grad 2" value="Katarakt grad 2"/>
+	      <item caption="Katarakt grad 3" value="Katarakt grad 3"/>
+	      <item caption="Pseudofaki" value="Pseudofaki"/>
+	      <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe_hoejre_andet">
+		<label caption="Andet:"/>
+		<lineedit name="spaltelampe_hoejre_andet"/>
+	      </altitem>
+	    </altcombobox>
+	  </frame>
+	</frame>
+	<label caption="Supplerende:"/>
+	<textedit name="slit_lamp.right.additional" value=""/>
+      </frame>
+
+      <!-- Venstre øje -->
+      <frame caption="Venstre øje" layout="vbox">
+	<frame layout="hbox">
+	  <frame layout="vbox">
+	    <label caption="Linsen:"/>
+	    <label/>
+	  </frame>
+	  <frame layout="vbox">
+	    <altcombobox name="slit_lamp.left.observation" layout="vbox" value="Ingen katarakt">
+	      <item caption="Ingen katarakt" value="Ingen katarakt"/>
+	      <item caption="Katarakt grad 1" value="Katarakt grad 1"/>
+	      <item caption="Katarakt grad 2" value="Katarakt grad 2"/>
+	      <item caption="Katarakt grad 3" value="Katarakt grad 3"/>
+	      <item caption="Pseudofaki" value="Pseudofaki"/>
+	      <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe_venstre_andet">
+		<label caption="Andet:"/>
+		<lineedit name="spaltelampe_venstre_andet"/>
+	      </altitem>
+	    </altcombobox>
+	  </frame>
+	</frame>
+	<label caption="Supplerende:"/>
+	<textedit name="slit_lamp.left.additional" value=""/>
+      </frame>
+
+    </frame>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.2.7.xml b/server/xml/macros/B.2.2.7.xml
new file mode 100644
index 0000000..d253d0d
--- /dev/null
+++ b/server/xml/macros/B.2.2.7.xml
@@ -0,0 +1,93 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081204: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    Højre/venstre byttet om.
+  -->
+<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>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </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>
+    </frame>
+
+    <!-- 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">
+
+	  <frame layout="vbox">
+	    <label caption=" "/>
+	    <label caption="På"/>
+	  </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 layout="vbox">
+	    <label caption=""/>
+	    <label caption="øje findes"/>
+	  </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>
+
+	  <spacer/>
+
+	</metawidget>
+      </multilist>
+    </frame>
+    
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.2.8.xml b/server/xml/macros/B.2.2.8.xml
new file mode 100644
index 0000000..82ea22f
--- /dev/null
+++ b/server/xml/macros/B.2.2.8.xml
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081204: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<macro name="B.2.2.8" version="1.0">
+  <resume store_in_journal="true">${amd_preop.conclusion}
+${amd_preop.conclusion_additional}${amd_preop.conclusion_terminated}.</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+    <script language="lua" name="afsluttes">
+      if value == 'Der findes ingen indikation for yderligere udredning.'
+      then
+        setValue('amd_preop.conclusion_terminated', ' - Afsluttes')
+      end
+      return true
+    </script>
+  </scripts>
+  <window caption="Yderligere diagnostik (B.2.2.8)"
+          layout="vbox">
+    
+    <frame layout="vbox">
+      <frame layout="hbox">
+	<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="Der findes indikation for fluorescens angiografi"
+		value="Der findes indikation for fluorescens angiografi."/>
+	</combobox>
+      </frame>
+      <label caption="Supplerende:"/>
+      <textedit name="amd_preop.conclusion_additional" value=""/>
+      <checkbox caption="Afsluttes" name="amd_preop.conclusion_terminated"
+		truevalue=" - Afsluttes" falsevalue="" value=""/>
+    </frame>
+    
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.3.xml b/server/xml/macros/B.2.3.xml
new file mode 100644
index 0000000..04f80ca
--- /dev/null
+++ b/server/xml/macros/B.2.3.xml
@@ -0,0 +1,67 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081204: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    20081209: Bent Bisballe Nyeng
+    Nye dryppe regimer = redesign med multilist.
+  -->
+<!--
+    20090108: Bent Bisballe Nyeng
+    Tilføjede et datofelt.
+  -->
+<macro name="B.2.3" version="1.0">
+  <resume>I henhold til øjenafdelingens retningslinier dryppes der med:
+${ocgtt.preparation}
+Drypning er foretaget af: ${ocgtt.initials}, den ${ocgtt.date}</resume>
+  <queries>
+  </queries>
+  <maps>
+    <map name="now">
+      -- Set date to now if no other data available within last 24 hours.
+      return os.time(), os.time() - 24*60*60, 'system'
+    </map>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Øjendrypning (B.2.3)"
+          layout="vbox">
+
+    <!-- Øjendrypning -->
+    <frame caption="Vælg præparat og tilføj til listen.">
+      <multilist name="ocgtt.preparation" layout="hbox" innerwidget="dryppemeta" value="">
+	<metawidget name="dryppemeta" format="Ocgt. ${prep} ${eye}" layout="hbox">
+	  <label caption="Præparat:"/>
+	  <combobox name="prep">
+	    <item caption="Mydriacyl 1%" value="mydriacyl 1%"/>
+	    <item caption="Metaoxedrin 10%" value="metaoxedrin 10%"/>
+	    <item caption="Tropicamid ukons. 0,5%" value="tropicamid ukons. 0,5%"/>
+	    <item caption="Phenylephrin ukons. 10%" value="phenylephrin ukons. 10%"/>
+	  </combobox>
+	  <label caption=""/>
+	  <label caption="Øje:"/>
+	  <combobox name="eye">
+	    <item caption="o.dxt" value="o.dxt"/>
+	    <item caption="o.sin" value="o.sin"/>
+	    <item caption="o.u" value="o.u"/>
+	  </combobox>
+	  <spacer/>
+	</metawidget>
+      </multilist>
+    </frame>
+
+    <frame layout="hbox">
+      <label width="200" caption="Drypning foretaget af (initialer):"/>
+      <lineedit name="ocgtt.initials" regexp="[a-zæøåA-ZÆØÅ]{2,5}" value=""/>
+      <label width="50" caption=" den "/>
+      <datetime name="ocgtt.date" map="now" value=""/>
+    </frame>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.7.1.xml b/server/xml/macros/B.2.7.1.xml
new file mode 100644
index 0000000..d1b9a13
--- /dev/null
+++ b/server/xml/macros/B.2.7.1.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081204: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<macro name="B.2.7.1" version="1.0">
+  <resume>I henhold til ovenstående ordination foretages der fluorescein angiografi efter afdelingens retningslinier.
+Injektion af fluorescein ved: ${fluorescein_injector_initials}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Injektion ved (B.2.7.1)"
+          layout="vbox">
+
+    <label caption="I henhold til ovenstående ordination foretages fluorescein injektion."/>
+    <frame layout="hbox">
+      <label width="300" caption="Fluorescein injektion foretaget af (initialer):"/>
+      <lineedit name="fluorescein_injector_initials" regexp="[a-zæøåA-ZÆØÅ]{2,5}" value=""/>
+      <spacer />
+    </frame>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.7.2.xml b/server/xml/macros/B.2.7.2.xml
new file mode 100644
index 0000000..cd18f02
--- /dev/null
+++ b/server/xml/macros/B.2.7.2.xml
@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081204: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<macro name="B.2.7.2" version="1.0">
+  <resume>Undersøgelsen viser god fyldning af det retinale kartrø.
+Svarende til det retinale ødem ses der i de tidlige faser ${fluorescens.early_fases}.
+Gennem de angiografiske faser udvikles der ${fluorescens.angiografic_fases}.</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Beskrivelse (B.2.7.2)"
+          layout="vbox">
+
+    <frame layout="vbox">
+
+      <label caption="Tidlige faser:"/>
+      <combobox name="fluorescens.early_fases" value="">
+	<item caption="Hyperfluorescens" value="hyperfluorescens" />
+	<item caption="Hypofluorescens" value="hypofluorescens" />
+	<item caption="Normalt fluorescensmønster" value="normalt fluorescensmønster" />
+      </combobox>
+      
+      <label caption="Angiografiske faser:" />
+      <altcombobox name="fluorescens.angiografic_fases" value="ingen ændringer i fluorescensen" layout="vbox">
+	<item caption="Ingen ændringer i fluorescensen"
+	      value="ingen ændringer i fluorescensen" />
+	<item caption="Gradvis tiltagende fluorescens, i senfaserne, velafgrænset med retinale kar som negative skygger henover"
+	      value="gradvis tiltagende hyperfluorescens, som i senfaserne står distinkt velafgrænset med de retinale kar som negative skygger henover" />
+	<item caption="Tiltagende hypofluorescens foreneligt med karnydannelse" value="tiltagende hypofluorescens foreneligt med karnydannelse" />
+	<altitem caption="Andet" value="andet" layout="hbox" innerwidget="fluorescens_angiografi_andet">
+	  <label caption="Andet:" />
+	  <lineedit name="fluorescens_angiografi_andet" />
+	</altitem>
+      </altcombobox>
+      
+    </frame>
+    
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.2.7.3.xml b/server/xml/macros/B.2.7.3.xml
new file mode 100644
index 0000000..d632330
--- /dev/null
+++ b/server/xml/macros/B.2.7.3.xml
@@ -0,0 +1,90 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20081208: Bent Bisballe Nyeng
+    Feltnavnene ændret så de giver mening.
+  -->
+<!--
+    200901007: Bent Bisballe Nyeng
+    Fluorescens info felterne skjules nu istedet for kun at blive disabled.
+  -->
+<macro name="B.2.7.3" version="1.0">
+  <resume>Konklusion:
+${fluorescens.conclusion}
+${fluorescens.additional_info}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+    <script language="lua" name="angiografi_konklusion">
+      -- This script sets the value of additional according to conclusion.
+
+      if( getValue('fluorescens.conclusion') == 'Klassisk subretinal karnydannelse.'
+          or getValue('fluorescens.conclusion') == 'Overvejende klassisk subretinal neovaskulær membran.' )
+      then
+        setValue('fluorescens.additional_info', 'additional')
+        setVisible('fluorescens.additional_info', true)
+        return true
+      else
+        setValue('fluorescens.additional_info', '')
+        setVisible('fluorescens.additional_info', false)
+        return true
+      end
+    </script>
+  </scripts>
+  <window caption="Konklusion (B.2.7.3)"
+          layout="vbox">
+
+    <combobox name="fluorescens.conclusion" value="test" script="angiografi_konklusion">
+      <item caption="Atrofiske foranderinger. Der findes ingen behandlingsindikation"
+	    value="Atrofiske foranderinger. Der findes ingen behandlingsindikation." />
+      <item caption="Pigmentepitelløsning. Der findes ingen behandlingsindikation"
+	    value="Pigmentepitelløsning. Der findes ingen behandlingsindikation." />
+      <item caption="Klassisk subretinal karnydannelse"
+	    value="Klassisk subretinal karnydannelse." />
+      <item caption="Overvejende klassisk subretinal neovaskulær membran"
+	    value="Overvejende klassisk subretinal neovaskulær membran." />
+      <item caption="Minimalt klassisk subretinal neovaskulær membran"
+	    value="Minimalt klassisk subretinal neovaskulær membran." />
+      <item caption="Occutalt subretinal neovaskulær membran."
+	    value="Occutalt subretinal neovaskulær membran." />
+    </combobox>
+
+    <frame name="yderligere_info_box" layout="hbox">
+      <frame layout="vbox">
+	<label caption="Yderligere information:" width="150"/>
+	<spacer/>
+      </frame>
+      <altcombobox name="fluorescens.additional_info" layout="vbox"
+		   script="angiografi_konklusion" visible="false">
+	<item caption="Ingen" value=""/>
+	<altitem caption="Udfyld" value="additional" innerwidget="additional_meta">
+          <metawidget name="additional_meta" layout="hbox"
+		      format="Membranen er beliggende ${position} og membranstørrelsen er ${size} µm.">
+	    <frame layout="vbox">
+	      <label caption="Membran beliggenhed:" />
+	      <label caption="Membranstørrelse:" />
+	    </frame>
+	    <frame layout="vbox">
+	      <combobox name="position" value="">
+		<item caption="Subfovealt" value="subfovealt" />
+		<item caption="Juxtafovealt" value="juxtafovealt" />
+		<item caption="Extrafovealt" value="extrafovealt" />
+	      </combobox>
+	      <frame layout="hbox">
+		<lineedit name="size" value=""/>
+		<label caption="µm" />
+	      </frame>
+	    </frame>
+	  </metawidget>
+	</altitem>
+      </altcombobox>
+    </frame>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.3.1.1.xml b/server/xml/macros/B.3.1.1.xml
new file mode 100644
index 0000000..c66cffc
--- /dev/null
+++ b/server/xml/macros/B.3.1.1.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="B.3.1.1" version="1.0">
+  <resume store_in_journal="false"></resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Intravitreal injektion indikation (B.3.1.1)" layout="vbox">
+    <frame layout="vbox">
+      <label caption="Der er fundet indikation for intravitreal injektion med Lucentis og patienten klargøres i henhold til afdelingens instruks."/>
+      <frame layout="hbox">
+	<label caption="Initialer:"/>
+	<lineedit name="intravitreal_initials"/>
+      </frame>
+    </frame>
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.3.1.2.xml b/server/xml/macros/B.3.1.2.xml
new file mode 100644
index 0000000..d21ba92
--- /dev/null
+++ b/server/xml/macros/B.3.1.2.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="B.3.1.2" version="1.0">
+  <resume store_in_journal="false"></resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Gennemgåelse 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_radiobutton">
+	  <radiobutton value="five_steps_yes" caption="Ja"/>
+	  <radiobutton value="five_steps_no" caption="Nej"/>
+	</radiobuttons>
+	<spacer />
+      </frame>
+    </frame>
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/B.3.1.3.xml b/server/xml/macros/B.3.1.3.xml
new file mode 100644
index 0000000..8faa31e
--- /dev/null
+++ b/server/xml/macros/B.3.1.3.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="B.3.1.3" version="1.0">
+  <resume store_in_journal="false"></resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="(B.3.1.3)" layout="vbox">
+    <frame layout="vbox">
+      <label height="80" caption="Der afvaskes periorbitalt med povidoniodid og efterfølgende dryppes der med povidoniodid. Efter 5 min bedøves med spongostan vædet i Lidocain 20 mg/ml tilsat adrenalin.
+Injektionsstedet nedadtil temporalt i konjunktiva afmærkes med passer 3,5 mm fra limbus."/>
+      <frame layout="hbox">
+	<label width="250" caption="Med 30 gauge kanyle gives 0,05 ml Lucentis"/>
+	<radiobuttons name="tekst_odxt_osin">
+	  <radiobutton value="o.dxt" caption="o.dxt"/>
+	  <radiobutton value="o.sin" caption="o.sin"/>
+	</radiobuttons>
+	<spacer/>
+      </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."/>
+    </frame>
+    <frame layout="hbox">
+      <spacer/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/test_altcombobox.xml b/server/xml/macros/test_altcombobox.xml
new file mode 100644
index 0000000..9e620b5
--- /dev/null
+++ b/server/xml/macros/test_altcombobox.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="test_altcombobox" version="1.0">
+  <resume></resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Test AltComboBox"
+          layout="vbox">
+
+    <altcombobox name="dims" value="futtefejer">
+      <item caption="Test1" value="test1"/>
+      <item caption="Test2" value="test2"/>
+      <item caption="Test3" value="test3"/>
+      <altitem caption="Test4" value="test4" innerwidget="inner">
+	<lineedit name="inner"/>
+      </altitem>
+    </altcombobox>
+
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Reset" action="reset"/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/test_button.xml b/server/xml/macros/test_button.xml
new file mode 100644
index 0000000..56f4168
--- /dev/null
+++ b/server/xml/macros/test_button.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="test_button" version="1.0">
+  <resume></resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Test Button"
+          layout="vbox">
+
+    <checkbox name="dims" caption="Er dette en checkbox?"
+	      truevalue="ja" falsevalue="nej"
+	      value="ja"/>
+
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Annullér" action="cancel"/>
+      <button caption="Reset" action="reset"/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/test_checkbox.xml b/server/xml/macros/test_checkbox.xml
new file mode 100644
index 0000000..acc2c0c
--- /dev/null
+++ b/server/xml/macros/test_checkbox.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="test_checkbox" version="1.0">
+  <resume></resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Test CheckBox"
+          layout="vbox">
+
+    <checkbox name="dims" caption="Er dette en checkbox?"
+	      truevalue="ja" falsevalue="nej"
+	      value="ja"/>
+
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Reset" action="reset"/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/test_combobox.xml b/server/xml/macros/test_combobox.xml
new file mode 100644
index 0000000..7ed186f
--- /dev/null
+++ b/server/xml/macros/test_combobox.xml
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="test_combobox" version="1.0">
+  <resume></resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Test ComboBox"
+          layout="vbox">
+
+    <combobox name="combo1" type="select">
+      <item caption="Test1" value="test1"/>
+      <item caption="Test2" value="test2"/>
+      <item caption="Test3" value="test3"/>
+      <item caption="Test4" value="test4"/>
+    </combobox>
+
+    <combobox name="combo2" type="search">
+      <item caption="Test1" value="test1"/>
+      <item caption="Test2" value="test2"/>
+      <item caption="Test3" value="test3"/>
+      <item caption="Test4" value="test4"/>
+    </combobox>
+
+    <combobox name="combo3" type="edit">
+      <item caption="Test1" value="test1"/>
+      <item caption="Test2" value="test2"/>
+      <item caption="Test3" value="test3"/>
+      <item caption="Test4" value="test4"/>
+    </combobox>
+
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Reset" action="reset"/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/test_dbwidget.xml b/server/xml/macros/test_dbwidget.xml
new file mode 100644
index 0000000..761862e
--- /dev/null
+++ b/server/xml/macros/test_dbwidget.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="test_dbwidget" version="1.0">
+  <resume></resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Test DBWidget"
+          layout="vbox">
+
+    <dbwidget name="prep" driver="QPSQL" server="sensei.j.auh.dk" user="postgres" database="lms"
+	      select="drugname, dosageform_code, strength_text"
+	      from="lms01"
+	      where="drugname || ' ' || strength_text || ' (' || dosageform_code || ')'"
+	      format="${drugname} ${strength_text} (${dosageform_code})"
+	      value="a"
+	      />
+
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Reset" action="reset"/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/test_lineedit.xml b/server/xml/macros/test_lineedit.xml
new file mode 100644
index 0000000..6c79d83
--- /dev/null
+++ b/server/xml/macros/test_lineedit.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="test_lineedit" version="1.0">
+  <resume></resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+    <script name="A" language="lua">
+      if ( value == '4' )
+      then
+        return true
+      end
+      return false
+    </script>
+  </scripts>
+  <window caption="Test LineEdit"
+          layout="vbox">
+
+    <lineedit name="dims" value="tester" script="A" regexp="[0-9]"/>
+      
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Reset" action="reset"/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/test_listbox.xml b/server/xml/macros/test_listbox.xml
new file mode 100644
index 0000000..5287d2f
--- /dev/null
+++ b/server/xml/macros/test_listbox.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="test_listbox" version="1.0">
+  <resume></resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Test ListBox"
+          layout="vbox">
+
+    <listbox name="dims" value="test2">
+      <item caption="Test1" value="test1"/>
+      <item caption="Test2" value="test2"/>
+      <item caption="Test3" value="test3"/>
+      <item caption="Test4" value="test4"/>
+    </listbox>
+      
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Reset" action="reset"/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/test_meta.xml b/server/xml/macros/test_meta.xml
new file mode 100644
index 0000000..0dc379d
--- /dev/null
+++ b/server/xml/macros/test_meta.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="test_meta" version="1.0">
+  <resume>Meta test: ${metatest}
+AltComboTest: ${altcombotest}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Meta Test"
+          layout="vbox">
+
+    <altcombobox name="altcombotest" layout="vbox" value="prut at pille i">
+      <item caption="Name1" value="Value1"/>
+      <item caption="Name2" value="Value2"/>
+      <item caption="Name3" value="Value3"/>
+      <altitem caption="Name4" value="Value4" layout="hbox" innerwidget="bar">
+	<label caption="Bar:"/>
+	<lineedit name="bar"/>
+      </altitem>
+    </altcombobox>
+
+    <metawidget name="metatest" layout="hbox" format="A: ${a}, B: ${b}" value="">
+      <label caption="A:"/>
+      <lineedit name="a" value=""/>
+      <label caption="B:"/>
+      <lineedit name="b" value=""/>
+    </metawidget>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+<!--      <button caption="Annullér" action="cancel"/> -->
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/test_metawidget.xml b/server/xml/macros/test_metawidget.xml
new file mode 100644
index 0000000..c2a71a5
--- /dev/null
+++ b/server/xml/macros/test_metawidget.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="test_metawidget" version="1.0">
+  <resume>${dims}</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Test Metawidget"
+          layout="vbox">
+
+    <metawidget layout="vbox" name="dims" format="${test1}: ${test2}" storechildren="true">
+      <lineedit name="test1" value="test"/>
+      <checkbox name="test2" value="ja" truevalue="ja" falsevalue="nej" caption="Og svaret er?"/>
+    </metawidget>
+
+    <metawidget layout="vbox" name="dims2" format="${a}: ${b}" storechildren="false">
+      <lineedit name="a" value="test"/>
+      <checkbox name="b" value="ja" truevalue="ja" falsevalue="nej" caption="Og svaret er?"/>
+    </metawidget>
+      
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Reset" action="reset"/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/test_multilist.xml b/server/xml/macros/test_multilist.xml
new file mode 100644
index 0000000..bb6ffff
--- /dev/null
+++ b/server/xml/macros/test_multilist.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="test_multilist" version="1.0">
+  <resume></resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Test MultiList"
+          layout="vbox">
+
+    <multilist name="dims" innerwidget="inner" value="tester">
+      <lineedit name="inner" value="test"/>
+    </multilist>
+      
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Reset" action="reset"/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/test_radiobuttons.xml b/server/xml/macros/test_radiobuttons.xml
new file mode 100644
index 0000000..92133be
--- /dev/null
+++ b/server/xml/macros/test_radiobuttons.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="test_radiobuttons" version="1.0">
+  <resume></resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Test Radiobuttons"
+          layout="vbox">
+
+    <radiobuttons name="test_radiobuttons" layout="vbox" value="test1">
+      <radiobutton caption="Test1" value="test1"/>
+      <radiobutton caption="Test2" value="test2"/>
+      <radiobutton caption="Test3" value="test3"/>
+    </radiobuttons>
+      
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Reset" action="reset"/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/macros/test_resume.xml b/server/xml/macros/test_resume.xml
new file mode 100644
index 0000000..a0916e7
--- /dev/null
+++ b/server/xml/macros/test_resume.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="test_resume" version="1.0">
+  <resume language="lua">
+    -- This is a LUA program!
+    if getValue('test2') == 'ja'
+    then
+      return getValue('dims') .. ' made out of ' .. getValue('test1') .. ' and ' .. getValue('test2')
+    else
+      return 'niksen'
+    end
+  </resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Test Resume"
+          layout="vbox">
+
+    <metawidget layout="vbox" name="dims"
+		format="${test1}: ${test2}"
+		storechildren="true">
+      <lineedit name="test1" value="test"/>
+      <checkbox caption="Og svaret er?"
+		name="test2" value="ja"
+		truevalue="ja" falsevalue="nej"/>
+    </metawidget>
+      
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Reset" action="reset"/>
+      <button caption="Gem" action="commit"/>
+    </frame>
+  </window>
+</macro>
diff --git a/server/xml/templates/amd_forunders.xml b/server/xml/templates/amd_forunders.xml
new file mode 100644
index 0000000..90c35bf
--- /dev/null
+++ b/server/xml/templates/amd_forunders.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<course name="amd_forunders" version="1.0">
+  <macro name="B.0" static="true"/>
+  
+  <macro header="Anamnese"/>
+  <macro name="B.1.1"/>
+  <macro name="B.1.2" compact="true"/>
+  <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"/>
+  <macro name="B.2.2.2"/>
+  <macro name="B.2.2.3"/>
+  <macro name="B.2.2.4.1"/>
+  <macro name="B.2.2.4.2"/>
+  <macro name="B.2.2.5"/>
+  <macro name="B.2.2.6"/>
+  <macro name="B.2.2.7"/>
+  <macro name="B.2.2.8"/>
+
+  <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.3" compact="true"/>
+
+</course>
+
diff --git a/server/xml/templates/test.xml b/server/xml/templates/test.xml
new file mode 100644
index 0000000..dd4c093
--- /dev/null
+++ b/server/xml/templates/test.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<course name="test" version="1.0">
+  <macro name="test_resume"/>
+  <macro name="test_button"/>
+  <macro name="test_radiobuttons"/>
+  <macro name="test_metawidget"/>
+  <macro name="test_listbox"/>
+  <macro name="test_lineedit"/>
+  <macro name="test_multilist"/>
+  <macro name="test_dbwidget"/>
+  <macro name="test_combobox"/>
+  <macro name="test_checkbox"/>
+  <macro name="test_altcombobox"/>
+</course>
-- 
cgit v1.2.3