summaryrefslogtreecommitdiff
path: root/server/xml
diff options
context:
space:
mode:
Diffstat (limited to 'server/xml')
-rw-r--r--server/xml/macros/B.2.1.3.xml2
-rw-r--r--server/xml/macros/B.2.10.2.xml9
-rw-r--r--server/xml/macros/B.2.7.1.xml14
-rw-r--r--server/xml/macros/B.2.7.2.xml9
-rw-r--r--server/xml/macros/B.2.7.3.xml112
5 files changed, 105 insertions, 41 deletions
diff --git a/server/xml/macros/B.2.1.3.xml b/server/xml/macros/B.2.1.3.xml
index caf5213..b279bfe 100644
--- a/server/xml/macros/B.2.1.3.xml
+++ b/server/xml/macros/B.2.1.3.xml
@@ -28,7 +28,7 @@ ${current_eye_disease}</resume>
<frame layout="vbox">
<label caption="Dato:"/>
- <datetime name="date" fuzziness="2"/>
+ <datetime name="date" fuzziness="3"/>
<label caption=""/>
</frame>
diff --git a/server/xml/macros/B.2.10.2.xml b/server/xml/macros/B.2.10.2.xml
index 74ba278..5cfd591 100644
--- a/server/xml/macros/B.2.10.2.xml
+++ b/server/xml/macros/B.2.10.2.xml
@@ -14,6 +14,15 @@
<window caption="Behandlingsindikation (B.2.10.2)"
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" value="">
diff --git a/server/xml/macros/B.2.7.1.xml b/server/xml/macros/B.2.7.1.xml
index d1b9a13..2710c20 100644
--- a/server/xml/macros/B.2.7.1.xml
+++ b/server/xml/macros/B.2.7.1.xml
@@ -5,7 +5,7 @@
-->
<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>
+Injektion af fluorescein ved: ${fluorescein_injection.initials}</resume>
<queries>
</queries>
<maps>
@@ -16,9 +16,19 @@ Injektion af fluorescein ved: ${fluorescein_injector_initials}</resume>
layout="vbox">
<label caption="I henhold til ovenstående ordination foretages fluorescein injektion."/>
+
+ <frame layout="hbox">
+ <label caption="Øje:" width="50"/>
+ <radiobuttons name="fluorescein_injection.eye" value="">
+ <radiobutton caption="o.dxt" value="o.dxt"/>
+ <radiobutton caption="o.sin" value="o.sin"/>
+ </radiobuttons>
+ <spacer/>
+ </frame>
+
<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=""/>
+ <lineedit name="fluorescein_injection.initials" regexp="[a-zæøåA-ZÆØÅ]{2,5}" value=""/>
<spacer />
</frame>
diff --git a/server/xml/macros/B.2.7.2.xml b/server/xml/macros/B.2.7.2.xml
index cd18f02..7ae99b7 100644
--- a/server/xml/macros/B.2.7.2.xml
+++ b/server/xml/macros/B.2.7.2.xml
@@ -17,6 +17,15 @@ Gennem de angiografiske faser udvikles der ${fluorescens.angiografic_fases}.</re
layout="vbox">
<frame layout="vbox">
+
+ <frame layout="hbox">
+ <label caption="Øje:" width="50"/>
+ <radiobuttons name="fluorescens.eye" value="">
+ <radiobutton caption="o.dxt" value="o.dxt"/>
+ <radiobutton caption="o.sin" value="o.sin"/>
+ </radiobuttons>
+ <spacer/>
+ </frame>
<label caption="Tidlige faser:"/>
<combobox name="fluorescens.early_fases" value="">
diff --git a/server/xml/macros/B.2.7.3.xml b/server/xml/macros/B.2.7.3.xml
index cbdbb86..857c88b 100644
--- a/server/xml/macros/B.2.7.3.xml
+++ b/server/xml/macros/B.2.7.3.xml
@@ -4,13 +4,35 @@
Feltnavnene ændret så de giver mening.
-->
<!--
- 200901007: Bent Bisballe Nyeng
+ 20090107: Bent Bisballe Nyeng
Fluorescens info felterne skjules nu istedet for kun at blive disabled.
-->
+<!--
+ 20090211: Bent Bisballe Nyeng
+ Fluorescens info felterne bliver nu disabled igen, men har f[et fjernet den
+ altcombo som omkransede dem. Desuden er et 'andet' felt tilføjet.
+ -->
<macro name="B.2.7.3" version="1.0">
- <resume>Konklusion:
-${fluorescens.conclusion}
-${fluorescens.additional_info}</resume>
+ <resume language="lua">
+ out = 'Konklusion:\n'
+
+ if( getValue('fluorescens.conclusion') == 'Klassisk subretinal karnydannelse.'
+ or getValue('fluorescens.conclusion') == 'Overvejende klassisk subretinal neovaskulær membran.' )
+ then
+ out = out .. getValue('fluorescens.conclusion') .. '\n'
+ out = out .. 'Membran placering: ' .. getValue('fluorescens.membrane.position') .. '\n'
+ out = out .. 'Membranstørrelse: ' .. getValue('fluorescens.membrane.size') .. 'µm\n'
+ else
+ if( getValue('fluorescens.conclusion') == 'andet' )
+ then
+ out = out .. getValue('fluorescens.conclusion.other') .. '\n'
+ else
+ out = out .. getValue('fluorescens.conclusion') .. '\n'
+ end
+ end
+
+ return out
+ </resume>
<queries>
</queries>
<maps>
@@ -22,20 +44,36 @@ ${fluorescens.additional_info}</resume>
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
+ enable('yderligere_info_frame')
+ else
+ disable('yderligere_info_frame')
+ end
+
+ if( getValue('fluorescens.conclusion') == 'andet' )
+ then
+ enable('andet_frame')
else
- setValue('fluorescens.additional_info', '')
- setVisible('fluorescens.additional_info', false)
- return true
+ disable('andet_frame')
end
+
+ return true
</script>
</scripts>
<window caption="Konklusion (B.2.7.3)"
layout="vbox">
- <combobox name="fluorescens.conclusion" value="" script="angiografi_konklusion">
+ <frame layout="hbox">
+ <label caption="Øje:" width="50"/>
+ <radiobuttons name="fluorescens.conclusion.eye" value="">
+ <radiobutton caption="o.dxt" value="o.dxt"/>
+ <radiobutton caption="o.sin" value="o.sin"/>
+ </radiobuttons>
+ <spacer/>
+ </frame>
+
+ <combobox name="fluorescens.conclusion"
+ value="Atrofiske foranderinger. Der findes ingen behandlingsindikation."
+ 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"
@@ -48,37 +86,35 @@ ${fluorescens.additional_info}</resume>
value="Minimalt klassisk subretinal neovaskulær membran." />
<item caption="Occutalt subretinal neovaskulær membran."
value="Occutalt subretinal neovaskulær membran." />
+ <item caption="Andet"
+ value="andet" />
</combobox>
- <frame name="yderligere_info_box" layout="hbox">
- <frame layout="vbox">
- <label caption="Yderligere information:" width="150"/>
+ <frame name="andet_frame" layout="hbox">
+ <label caption="Andet:"/>
+ <lineedit name="fluorescens.conclusion.other" value=""/>
+ </frame>
+
+ <frame name="yderligere_info_frame" layout="vbox">
+ <label caption="Yderligere information:"/>
+
+ <frame layout="hbox">
+ <label caption="Membran beliggenhed:" width="150"/>
+ <combobox name="fluorescens.membrane.position" value="">
+ <item caption="Subfovealt" value="subfovealt" />
+ <item caption="Juxtafovealt" value="juxtafovealt" />
+ <item caption="Extrafovealt" value="extrafovealt" />
+ </combobox>
<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 layout="hbox">
+ <label caption="Membranstørrelse:" width="150"/>
+ <lineedit name="fluorescens.membrane.size" regexp="[0-9,.-]+" value=""/>
+ <label caption="µm" />
+ <spacer/>
+ </frame>
+
</frame>
<!-- Knapper -->
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 08:58:47 +0000