summaryrefslogtreecommitdiff
path: root/server/xml/macros
diff options
context:
space:
mode:
Diffstat (limited to 'server/xml/macros')
-rw-r--r--server/xml/macros/akselaengde-1.0.xml27
-rw-r--r--server/xml/macros/central_corneatykkelse-1.0.xml23
-rw-r--r--server/xml/macros/pupilstoerrelse-1.0.xml23
3 files changed, 48 insertions, 25 deletions
diff --git a/server/xml/macros/akselaengde-1.0.xml b/server/xml/macros/akselaengde-1.0.xml
index b52ab7c..1a06b19 100644
--- a/server/xml/macros/akselaengde-1.0.xml
+++ b/server/xml/macros/akselaengde-1.0.xml
@@ -1,31 +1,24 @@
<?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="akselaengde" version="1.0">
<resume language="lua">
out = ''
- out = out .. 'Akselængde:\n'
- if ( getValue('akselaengde.right.missing') == '' )
- out = out .. 'Højre øje: ' .. getValue('akselaengde.right.length') .. ' mm'
+ if ( getValue('akselaengde.right.missing') == '' or getValue('akselaengde.left.missing') == '' )
then
+ out = out .. 'Akselængde: ' .. getValue('akselaengde.method') .. '\n'
end
+
if ( getValue('akselaengde.right.missing') == '' )
- out = out .. 'Venstre øje: ' .. getValue('akselaengde.left.length') .. ' mm'
then
+ out = out .. 'Højre øje: ' .. getValue('akselaengde.right.length') .. '\n'
+ end
+
+ if ( getValue('akselaengde.left.missing') == '' )
+ then
+ out = out .. 'Venstre øje: ' .. getValue('akselaengde.left.length') .. '\n'
end
return out
-</resume>
+ </resume>
<queries>
</queries>
<maps>
diff --git a/server/xml/macros/central_corneatykkelse-1.0.xml b/server/xml/macros/central_corneatykkelse-1.0.xml
index f5ad9ce..e697bbc 100644
--- a/server/xml/macros/central_corneatykkelse-1.0.xml
+++ b/server/xml/macros/central_corneatykkelse-1.0.xml
@@ -12,10 +12,25 @@
'missing eye' tilføjet.
-->
<macro name="central_corneatykkelse" version="1.0">
- <resume language="pracro">Central corneatykkelse:
-Højre øje: ${central_corneatykkelse.right.thickness} mm
-Venstre øje: ${central_corneatykkelse.left.thickness} mm
-</resume>
+ <resume language="lua">
+ out = ''
+ if ( getValue('central_corneatykkelse.right.missing') == '' or getValue('central_corneatykkelse.left.missing') == '' )
+ then
+ out = out .. 'Central corneatykkelse:\n'
+ end
+
+ if ( getValue('central_corneatykkelse.right.missing') == '' )
+ then
+ out = out .. 'Højre øje: ' .. getValue('central_corneatykkelse.right.thickness') .. ' mm\n'
+ end
+
+ if ( getValue('central_corneatykkelse.left.missing') == '' )
+ then
+ out = out .. 'Venstre øje: ' .. getValue('central_corneatykkelse.left.thickness') .. ' mm\n'
+ end
+
+ return out
+ </resume>
<queries>
</queries>
<maps>
diff --git a/server/xml/macros/pupilstoerrelse-1.0.xml b/server/xml/macros/pupilstoerrelse-1.0.xml
index 7ec4c03..c2a771a 100644
--- a/server/xml/macros/pupilstoerrelse-1.0.xml
+++ b/server/xml/macros/pupilstoerrelse-1.0.xml
@@ -12,10 +12,25 @@
'missing eye' tilføjet.
-->
<macro name="pupilstoerrelse" version="1.0">
- <resume language="pracro">Pupilstørrelse:
-Højre øje: ${pupilstoerrelse.right.diameter} mm
-Venstre øje: ${pupilstoerrelse.left.diameter} mm
-</resume>
+ <resume language="lua">
+ out = ''
+ if ( getValue('pupilstoerrelse.right.missing') == '' or getValue('pupilstoerrelse.left.missing') == '' )
+ then
+ out = out .. 'Pupilstørrelse:\n'
+ end
+
+ if ( getValue('pupilstoerrelse.right.missing') == '' )
+ then
+ out = out .. 'Højre øje: ' .. getValue('pupilstoerrelse.right.diameter') .. ' mm\n'
+ end
+
+ if ( getValue('pupilstoerrelse.left.missing') == '' )
+ then
+ out = out .. 'Venstre øje: ' .. getValue('pupilstoerrelse.left.diameter') .. ' mm\n'
+ end
+
+ return out
+ </resume>
<queries>
</queries>
<maps>