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.6.xml | 184 +++++++++++++++++++++++++++++++----------- 1 file changed, 139 insertions(+), 45 deletions(-) (limited to 'server/xml/macros/B.2.2.6.xml') diff --git a/server/xml/macros/B.2.2.6.xml b/server/xml/macros/B.2.2.6.xml index 78c862f..37c04e8 100644 --- a/server/xml/macros/B.2.2.6.xml +++ b/server/xml/macros/B.2.2.6.xml @@ -7,17 +7,99 @@ 20090108: Bent Bisballe Nyeng Højre/venstre byttet om. --> + - Spaltelampe: -Linsen, højre side: ${slit_lamp.right.observation} -${slit_lamp.right.additional} -Linsen, venstre side: ${slit_lamp.left.observation} -${slit_lamp.left.additional} + + out = '' + if ( getValue('slit_lamp.right.missing') == '' or getValue('slit_lamp.left.missing') == '' ) + then + out = out .. 'Spaltelampe:\n' + end + + if ( getValue('slit_lamp.right.missing') == '' ) + then + out = out .. 'Linsen, højre side: ' .. getValue('slit_lamp.right.observation') .. '\n' + if ( getValue('slit_lamp.right.additional') ~= '' ) + then + out = out .. 'Supplerende:\n' .. getValue('slit_lamp.right.additional') .. '\n' + end + end + + if ( getValue('slit_lamp.left.missing') == '' ) + then + out = out .. 'Linsen, venstre side: ' .. getValue('slit_lamp.left.observation') .. '\n' + if ( getValue('slit_lamp.left.additional') ~= '' ) + then + out = out .. 'Supplerende:\n' .. getValue('slit_lamp.left.additional') .. '\n' + end + 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 + + + @@ -25,53 +107,65 @@ ${slit_lamp.left.additional} - - - -