From 3f1b036458bf9b348b65c36fa30ecb177800d703 Mon Sep 17 00:00:00 2001 From: deva Date: Tue, 10 Feb 2009 13:18:01 +0000 Subject: New macros --- server/xml/macros/B.2.2.3.xml | 158 ++++++++++++++++++++++++++++++++---------- 1 file changed, 123 insertions(+), 35 deletions(-) (limited to 'server/xml/macros/B.2.2.3.xml') diff --git a/server/xml/macros/B.2.2.3.xml b/server/xml/macros/B.2.2.3.xml index 849d80f..363a33d 100644 --- a/server/xml/macros/B.2.2.3.xml +++ b/server/xml/macros/B.2.2.3.xml @@ -7,12 +7,70 @@ 20090108: Bent Bisballe Nyeng Højre/venstre byttet om. --> + - Autorefraktion højre øje: ${autorefractor.right.sphere} sf, ${autorefractor.right.cyl} cyl ${autorefractor.right.axis} grader. -Autorefraktion venstre øje: ${autorefractor.left.sphere} sf, ${autorefractor.left.cyl} cyl ${autorefractor.left.axis} grader. + + out = '' + if ( getValue('autorefractor.right.missing') == '' ) + then + out = out .. 'Autorefraktion højre øje: ' .. getValue('autorefractor.right.sphere') + .. ' sf, ' .. getValue('autorefractor.right.cyl') + .. ' cyl ' .. getValue('autorefractor.right.axis') .. ' grader.\n' + end + + if ( getValue('autorefractor.left.missing') == '' ) + then + out = out .. 'Autorefraktion venstre øje: ' .. getValue('autorefractor.left.sphere') + .. ' sf, ' .. getValue('autorefractor.left.cyl') + .. ' cyl ' .. getValue('autorefractor.left.axis') .. ' grader.\n' + end + + return out + + + + + value = 0 + timestamp = 0 + source = 'pracro' + + if( missing_eye_right ) + then + if( missing_eye_right.value and missing_eye_right.value == '' ) + then + value = '' + timestamp = missing_eye_right.timestamp + else + value = 'mangler' + timestamp = missing_eye_right.timestamp + end + end + return value, timestamp, source + + + value = 0 + timestamp = 0 + source = 'pracro' + + if( missing_eye_left ) + then + if( missing_eye_left.value and missing_eye_left.value == '' ) + then + value = '' + timestamp = missing_eye_left.timestamp + else + value = 'mangler' + timestamp = missing_eye_left.timestamp + end + end + return value, timestamp, source + + + @@ -64,43 +140,55 @@ Autorefraktion venstre øje: ${autorefractor.left.sphere} sf, ${autorefractor.le - - - -