New headline generating macros of the amd_behandling and amd_kontrolunders templates.

4 files changed, 82 insertions, 28 deletions

diff --git a/server/xml/macros/amd_behandling_overskrift-1.0.xml b/server/xml/macros/amd_behandling_overskrift-1.0.xml
new file mode 100644
index 0000000..1f17172
--- /dev/null
+++ b/server/xml/macros/amd_behandling_overskrift-1.0.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="amd_behandling_overskrift" version="1.0">
+  <resume>Behandling af AMD med Lucentis</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <widgets caption="Påbegyndelse af behandlingsforløb"
+          layout="vbox">
+
+    <checkbox name="begynd"
+	      caption="Behandling påbegyndes"
+	      truevalue="begynd"
+	      falsevalue=""
+	      regexp="begynd"/>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+
+  </widgets>
+</macro>
diff --git a/server/xml/macros/amd_kontrolunders_overskrift-1.0.xml b/server/xml/macros/amd_kontrolunders_overskrift-1.0.xml
new file mode 100644
index 0000000..aa24bac
--- /dev/null
+++ b/server/xml/macros/amd_kontrolunders_overskrift-1.0.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="amd_kontrolunders_overskrift" version="1.0">
+  <resume>Kontrolundersøgelse i AMD forløb</resume>
+  <queries>
+  </queries>
+  <maps>
+  </maps>
+  <scripts>
+  </scripts>
+  <widgets caption="Påbegyndelse af kontorlforløb"
+          layout="vbox">
+
+    <checkbox name="begynd"
+	      caption="Kontrol påbegyndes"
+	      truevalue="begynd"
+	      falsevalue=""
+	      regexp="begynd"/>
+
+    <!-- Knapper -->
+    <frame layout="hbox">
+      <spacer />
+      <button caption="Gem" action="commit"/>
+    </frame>
+
+  </widgets>
+</macro>
diff --git a/server/xml/templates/amd_behandling.xml b/server/xml/templates/amd_behandling.xml
index 461f526..db32331 100644
--- a/server/xml/templates/amd_behandling.xml
+++ b/server/xml/templates/amd_behandling.xml
@@ -1,12 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<template name="amd_behandling" version="1.0" title="AMD behandling"
-					resume="Behandling af AMD med Lucentis">
+<template name="amd_behandling" version="1.0" title="AMD behandling">
   <macro name="header" static="true"/>
-  
+
+  <macro name="amd_behandling_overskrift"/>
+
   <header caption="Behandling"/>
-  <macro name="intravitreal_injektion_indikation"/>
-  <macro name="gennemgang_af_de_5_trin"/>
-  <macro name="amd_procedure"/>
+  <macro name="intravitreal_injektion_indikation" requires="amd_behandling_overskrift"/>
+  <macro name="gennemgang_af_de_5_trin" requires="amd_behandling_overskrift"/>
+  <macro name="amd_procedure" requires="amd_behandling_overskrift"/>
 
 </template>
 
diff --git a/server/xml/templates/amd_kontrolunders.xml b/server/xml/templates/amd_kontrolunders.xml
index e2bd5bb..1c64760 100644
--- a/server/xml/templates/amd_kontrolunders.xml
+++ b/server/xml/templates/amd_kontrolunders.xml
@@ -1,37 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<template name="amd_kontrolunders" version="1.0" title="AMD kontrolundersøgelse"
-	  resume="Kontrolundersøgelse i AMD forløb">
+<template name="amd_kontrolunders" version="1.0" title="AMD kontrolundersøgelse">
 
   <macro name="header" static="true"/>
   
+  <macro name="amd_kontrolunders_overskrift"/>
+
   <header caption="Anamnese"/>
-  <macro name="allergier"/>
-  <macro name="medicin" compact="true"/>
-  <macro name="subjektiv_evaluering"/>
-  <macro name="aktuelle"/>
+  <macro name="allergier" requires="amd_kontrolunders_overskrift"/>
+  <macro name="medicin" compact="true" requires="amd_kontrolunders_overskrift"/>
+  <macro name="subjektiv_evaluering" requires="amd_kontrolunders_overskrift"/>
+  <macro name="aktuelle" requires="amd_kontrolunders_overskrift"/>
 
   <header caption="Objektiv undersøgelse"/>
-  <macro name="visus"/>
-  <macro name="egen_brille"/>
-  <macro name="autorefraktion"/>
-  <macro name="oct_maaling"/>
-  <macro name="oct_konklusion" requires="octmeasurement"/>
-  <macro name="oejentryk"/>
-  <macro name="spaltelampe"/>
-  <macro name="90D_linse"/>
-  <macro name="yderligere_diagnostik"/>
-  <macro name="vurdering_af_fundus"/>
+  <macro name="visus" requires="amd_kontrolunders_overskrift"/>
+  <macro name="egen_brille" requires="amd_kontrolunders_overskrift"/>
+  <macro name="autorefraktion" requires="amd_kontrolunders_overskrift"/>
+  <macro name="oct_maaling" requires="amd_kontrolunders_overskrift"/>
+  <macro name="oct_konklusion" requires="octmeasurement,amd_kontrolunders_overskrift"/>
+  <macro name="oejentryk" requires="amd_kontrolunders_overskrift"/>
+  <macro name="spaltelampe" requires="amd_kontrolunders_overskrift"/>
+  <macro name="90D_linse" requires="amd_kontrolunders_overskrift"/>
+  <macro name="yderligere_diagnostik" requires="amd_kontrolunders_overskrift"/>
+  <macro name="vurdering_af_fundus" requires="amd_kontrolunders_overskrift"/>
 
   <header caption="Øjendrypning"/>
-  <macro name="oejendrypning"/>
+  <macro name="oejendrypning" requires="amd_kontrolunders_overskrift"/>
 
   <header caption="Fluorescens angiografi"/>
-  <macro name="fluorescens_faser"/>
-  <macro name="fluorescens_konklusion"/>
+  <macro name="fluorescens_faser" requires="amd_kontrolunders_overskrift"/>
+  <macro name="fluorescens_konklusion" requires="amd_kontrolunders_overskrift"/>
 
   <header caption="Samlet konklusion"/>
-  <macro name="information"/>
-  <macro name="amd_genbehandlingsindikation"/>
-  <macro name="informeret_samtykke" compact="true"/>
+  <macro name="information" requires="amd_kontrolunders_overskrift"/>
+  <macro name="amd_genbehandlingsindikation" requires="amd_kontrolunders_overskrift"/>
+  <macro name="informeret_samtykke" compact="true" requires="amd_kontrolunders_overskrift"/>
 
 </template>