Some tweaking in the new dependency system. Mostly GUI stuff.

2 files changed, 74 insertions, 24 deletions

diff --git a/server/xml/macros/B.0.1.xml b/server/xml/macros/B.0.1.xml
new file mode 100644
index 0000000..fcaf010
--- /dev/null
+++ b/server/xml/macros/B.0.1.xml
@@ -0,0 +1,50 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    20090420: Bent Bisballe Nyeng
+    Tilføjede '-' til cpr nummeret.
+
+    20090526: Bent Bisballe Nyeng
+    Nye min størrelser på lineedits, så navnet altid kan ses.
+  -->
+<macro name="B.0.1" version="1.0">
+  <resume store_in_journal="true">
+    Henvist af ${referral.doctor} til forundersøgelse under diagnosen: ${referral.diagnose}
+  </resume>
+  <queries>
+    <query service="pentominos" class="referral" ttl="1000000"/>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <window caption="Henvisning (B.0.1)"
+          layout="vbox">
+
+    <frame layout="hbox">
+
+    <!-- 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"/>
+      </frame>
+      <frame layout="hbox">
+        <label width="100" caption="Henvisningskode:"/>
+        <lineedit name="referral.diagnosecode" map="henvisning.code" value="-"/>
+        <label width="60" caption="Diagnose:"/>
+        <lineedit width="100" name="referral.diagnose"
+		  map="henvisning.diagnose" value="-"/>
+      </frame>
+    </frame>
+
+    </frame>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+
+  </window>
+</macro>
diff --git a/server/xml/templates/amd_forunders.xml b/server/xml/templates/amd_forunders.xml
index 0b72ac6..66b6be8 100644
--- a/server/xml/templates/amd_forunders.xml
+++ b/server/xml/templates/amd_forunders.xml
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<course name="amd_forunders" version="1.0" title="AMD forundersøgelse"
-	resume="Henvist til forundersøgelse under diagnosen: AMD">
+<course name="amd_forunders" version="1.0" title="AMD forundersøgelse">
   <macro name="B.0" static="true"/>
+  <macro name="B.0.1"/>
   
   <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 name="B.1.1" requires="B.0.1"/>
+  <macro name="B.1.2" requires="B.0.1" compact="true"/>
+  <macro name="B.1.3" requires="B.0.1"/>
+  <macro name="B.2.1.1" requires="B.0.1"/>
+  <macro name="B.2.1.2" requires="B.0.1"/>
+  <macro name="B.2.1.3" requires="B.0.1"/>
 
   <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 name="B.2.2.1" requires="B.0.1"/>
+  <macro name="B.2.2.2" requires="B.0.1"/>
+  <macro name="B.2.2.3" requires="B.0.1"/>
+  <macro name="B.2.2.4.1" requires="B.0.1"/>
+  <macro name="B.2.2.4.2" requires="B.0.1,B.2.2.4.1"/>
+  <macro name="B.2.2.5" requires="B.0.1"/>
+  <macro name="B.2.2.6" requires="B.0.1"/>
+  <macro name="B.2.2.7" requires="B.0.1"/>
+  <macro name="B.2.2.8" requires="B.0.1"/>
 
   <macro header="Øjendrypning"/>
-  <macro name="B.2.3"/>
+  <macro name="B.2.3" requires="B.0.1"/>
 
   <macro header="Fluorescens angiografi"/>
-  <macro name="B.2.7.1"/>
-  <macro name="B.2.7.2"/>
-  <macro name="B.2.7.3"/>
+  <macro name="B.2.7.1" requires="B.0.1"/>
+  <macro name="B.2.7.2" requires="B.0.1"/>
+  <macro name="B.2.7.3" requires="B.0.1"/>
 
   <macro header="Samlet konklusion"/>
-  <macro name="B.2.10.1"/>
-  <macro name="B.2.10.2"/>
-  <macro name="B.2.10.3" compact="true"/>
+  <macro name="B.2.10.1" requires="B.0.1"/>
+  <macro name="B.2.10.2" requires="B.0.1"/>
+  <macro name="B.2.10.3" requires="B.0.1" compact="true"/>
 
 </course>