From 28350af1374c07d1dfdee727d9d6d37219446d4f Mon Sep 17 00:00:00 2001 From: senator Date: Mon, 17 Aug 2009 06:53:14 +0000 Subject: Et eller andet --- server/xml/macros/keratometri-1.0.xml | 26 +++----------------------- server/xml/macros/tonometri-1.0.xml | 25 ++++++------------------- 2 files changed, 9 insertions(+), 42 deletions(-) (limited to 'server/xml') diff --git a/server/xml/macros/keratometri-1.0.xml b/server/xml/macros/keratometri-1.0.xml index 2b54164..e568d0e 100644 --- a/server/xml/macros/keratometri-1.0.xml +++ b/server/xml/macros/keratometri-1.0.xml @@ -1,33 +1,13 @@ - - - out = '' if ( getValue('keratometri.right.missing') == '' ) then - out = out .. 'Keratometri, højre øje:\n' .. - 'Radius 1: ' .. getValue('keratometri.right.r1') .. - 'Radius 2: ' .. getValue('keratometri.right.r2') .. - 'Cylinder: ' .. getValue('keratometri.right.x1') + if ( getValue('keratometri.right.x1') > 0 and getValue('keratometri.right.x1') < 90 ) + end - - if ( getValue('keratometri.left.missing') == '' ) - then - out = out .. 'Keratometri, venstre øje:\n' .. - 'Radius 1: ' .. getValue('keratometri.left.r1') .. - 'Radius 2: ' .. getValue('keratometri.left.r2') .. - 'Cylinder: ' .. getValue('keratometri.left.x1') + out = out .. 'Keratometri, højre øje:\n' .. 'Radius 1: ' .. getValue('keratometri.right.r1') .. ' mm (' .. string.format('%f', 337.50 / getValue('keratometri.right.r1')) .. ' D) i ' .. getValue('keratometri.right.x1') .. ' grader.\n\nRadius 2: ' .. getValue('keratometri.right.r2') .. ' mm (' .. string.format('%f', 337.50 / getValue('keratometri.right.r2')) .. ' D) i ' .. getValue('keratometri.right.x2')' end return out diff --git a/server/xml/macros/tonometri-1.0.xml b/server/xml/macros/tonometri-1.0.xml index 33171e8..189bdad 100644 --- a/server/xml/macros/tonometri-1.0.xml +++ b/server/xml/macros/tonometri-1.0.xml @@ -1,33 +1,20 @@ - - - out = '' - if ( getValue('tonometri.right.missing') == '' or getValue('tonometri.left.missing') == '' ) then - out = out .. getValue('tonometri.device') .. ':\n' + out = out .. getValue('tonometri.method') .. ':\n' end if ( getValue('tonometri.right.missing') == '' ) then - out = out .. 'Højre øje: ' .. getValue('tonometri.pressure.right') .. ' mmHg\n' + out = out .. 'Højre øje: ' .. getValue('tonometri.right.pressure') .. ' mmHg\n' end if ( getValue('tonometri.left.missing') == '' ) then - out = out .. 'Venstre øje: ' .. getValue('tonometri.pressure.left') .. ' mmHg\n' + out = out .. 'Venstre øje: ' .. getValue('tonometri.left.pressure') .. ' mmHg\n' end return out @@ -142,7 +129,7 @@