From fa8bc5be4149b477b4c0f8424fa82d0bede194c9 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Thu, 6 Aug 2009 14:17:29 +0000
Subject: Reintroduced a deleted macro (an error)
---
.../macros/amd_genbehandlingsindikation-1.0.xml | 38 ++++++++++++++++++++++
server/xml/macros/amdtreatmentindication-1.0.xml | 38 ----------------------
server/xml/templates/amd_kontrolunders.xml | 5 +--
3 files changed, 41 insertions(+), 40 deletions(-)
create mode 100644 server/xml/macros/amd_genbehandlingsindikation-1.0.xml
delete mode 100644 server/xml/macros/amdtreatmentindication-1.0.xml
diff --git a/server/xml/macros/amd_genbehandlingsindikation-1.0.xml b/server/xml/macros/amd_genbehandlingsindikation-1.0.xml
new file mode 100644
index 0000000..5b5f652
--- /dev/null
+++ b/server/xml/macros/amd_genbehandlingsindikation-1.0.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="amd_genbehandlingsindikation" version="1.0">
+ <resume>${amd.indication}</resume>
+ <queries>
+ </queries>
+ <maps>
+ </maps>
+ <scripts>
+ </scripts>
+ <widgets caption="Behandlingsindikation (B.2.10)"
+ layout="vbox">
+
+ <frame layout="hbox">
+ <label caption="Øje:" width="50"/>
+ <radiobuttons name="amd.indication.eye" value="">
+ <radiobutton caption="o.dxt" value="o.dxt"/>
+ <radiobutton caption="o.sin" value="o.sin"/>
+ </radiobuttons>
+ <spacer/>
+ </frame>
+
+ <frame layout="vbox">
+ <label caption="Der findes indikation for:"/>
+ <combobox name="amd.indication">
+ <item caption="Der findes indikation for at gentage behandlingen."
+ value="Der findes indikation for at gentage behandlingen."/>
+ <item caption="Der holdes pause med behandlingen."
+ value="Der holdes pause med behandlingen."/>
+ </combobox>
+ </frame>
+
+ <!-- Knapper -->
+ <frame layout="hbox">
+ <spacer/>
+ <button caption="Gem" action="commit"/>
+ </frame>
+ </widgets>
+</macro>
diff --git a/server/xml/macros/amdtreatmentindication-1.0.xml b/server/xml/macros/amdtreatmentindication-1.0.xml
deleted file mode 100644
index 29c70c5..0000000
--- a/server/xml/macros/amdtreatmentindication-1.0.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<macro name="amdtreatmentindication" version="1.0">
- <resume>${amd.indication}</resume>
- <queries>
- </queries>
- <maps>
- </maps>
- <scripts>
- </scripts>
- <widgets caption="Behandlingsindikation (B.2.10.4)"
- layout="vbox">
-
- <frame layout="hbox">
- <label caption="Øje:" width="50"/>
- <radiobuttons name="amd.indication.eye" value="">
- <radiobutton caption="o.dxt" value="o.dxt"/>
- <radiobutton caption="o.sin" value="o.sin"/>
- </radiobuttons>
- <spacer/>
- </frame>
-
- <frame layout="vbox">
- <label caption="Der findes indikation for:"/>
- <combobox name="amd.indication">
- <item caption="Der findes indikation for at gentage behandlingen."
- value="Der findes indikation for at gentage behandlingen."/>
- <item caption="Der holdes pause med behandlingen."
- value="Der holdes pause med behandlingen."/>
- </combobox>
- </frame>
-
- <!-- Knapper -->
- <frame layout="hbox">
- <spacer/>
- <button caption="Gem" action="commit"/>
- </frame>
- </widgets>
-</macro>
diff --git a/server/xml/templates/amd_kontrolunders.xml b/server/xml/templates/amd_kontrolunders.xml
index 86ae20f..e2bd5bb 100644
--- a/server/xml/templates/amd_kontrolunders.xml
+++ b/server/xml/templates/amd_kontrolunders.xml
@@ -1,6 +1,7 @@
<?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">
+ resume="Kontrolundersøgelse i AMD forløb">
+
<macro name="header" static="true"/>
<header caption="Anamnese"/>
@@ -30,7 +31,7 @@
<header caption="Samlet konklusion"/>
<macro name="information"/>
- <macro name="amd_behandlingsindikation"/>
+ <macro name="amd_genbehandlingsindikation"/>
<macro name="informeret_samtykke" compact="true"/>
</template>
--
cgit v1.2.3