From de91c53b843e9c7779fabcdef67a716c08f3c890 Mon Sep 17 00:00:00 2001 From: senator Date: Fri, 6 Nov 2009 11:27:47 +0000 Subject: all sf cyl grader macros now allow only sf filled in. templates updated --- server/xml/macros/visus-uden_korr-1.0.xml | 659 +++++++++++++++++++++++++++++- 1 file changed, 641 insertions(+), 18 deletions(-) (limited to 'server/xml/macros/visus-uden_korr-1.0.xml') diff --git a/server/xml/macros/visus-uden_korr-1.0.xml b/server/xml/macros/visus-uden_korr-1.0.xml index 56380f3..9d450e6 100644 --- a/server/xml/macros/visus-uden_korr-1.0.xml +++ b/server/xml/macros/visus-uden_korr-1.0.xml @@ -9,18 +9,26 @@ then out = out .. ', ' .. getValue('visus.uden_korr.kontrast.right') .. ' kontrast' end - if ( getValue('visus.uden_korr.st_hul.right') ~= '' ) - then - out = out .. ', ' .. getValue('visus.uden_korr.st_hul.right') - end out = out .. ':\n' if ( getValue('visus.uden_korr.snellen.right') ~= '' ) then - out = out .. 'Snellen: ' .. getValue('visus.uden_korr.snellen.right') .. ' s.c.\n' + out = out .. 'Snellen: ' .. getValue('visus.uden_korr.snellen.right') .. '\n' end if ( getValue('visus.uden_korr.etdrs.right') ~= '' ) then - out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.right') .. ' s.c.\n' + out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.right') .. '\n' + end + if ( getValue('visus.uden_korr.st_hul.right') ~= '' ) + then + out = out .. 'Måling foretaget med st. hul:\n' + if ( getValue('visus.uden_korr.st_hul.snellen.right') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.uden_korr.st_hul.snellen.right') .. '\n' + end + if ( getValue('visus.uden_korr.st_hul.etdrs.right') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.st_hul.etdrs.right') .. '\n' + end end if ( getValue('visus.uden_korr.missing.left') == '' ) then @@ -28,6 +36,14 @@ end end + + + + + + + + if ( getValue('visus.uden_korr.missing.left') == '' ) then out = out .. 'Visus, uden korr., o.sin' @@ -35,18 +51,26 @@ then out = out .. ', ' .. getValue('visus.uden_korr.kontrast.left') .. ' kontrast' end - if ( getValue('visus.uden_korr.st_hul.left') ~= '' ) - then - out = out .. ', ' .. getValue('visus.uden_korr.st_hul.left') - end out = out .. ':\n' if ( getValue('visus.uden_korr.snellen.left') ~= '' ) then - out = out .. 'Snellen: ' .. getValue('visus.uden_korr.snellen.left') .. ' s.c.\n' + out = out .. 'Snellen: ' .. getValue('visus.uden_korr.snellen.left') .. '\n' end if ( getValue('visus.uden_korr.etdrs.left') ~= '' ) then - out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.left') .. ' s.c.\n' + out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.left') .. '\n' + end + if ( getValue('visus.uden_korr.st_hul.left') ~= '' ) + then + out = out .. 'Måling foretaget med st. hul:\n' + if ( getValue('visus.uden_korr.st_hul.snellen.left') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.uden_korr.st_hul.snellen.left') .. '\n' + end + if ( getValue('visus.uden_korr.st_hul.etdrs.left') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.st_hul.etdrs.left') .. '\n' + end end if ( getValue('visus.uden_korr.missing.left') == '' ) then @@ -54,6 +78,33 @@ end end + + + + + + + + + + if ( getValue('visus.uden_korr.ou') ~= '' ) + then + out = out .. 'Visus, uden korr., o.u' + if ( getValue('visus.uden_korr.kontrast.ou') ~= '' ) + then + out = out .. ', ' .. getValue('visus.uden_korr.kontrast.ou') .. ' kontrast' + end + out = out .. ':\n' + if ( getValue('visus.uden_korr.snellen.ou') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.uden_korr.snellen.ou') .. '\n' + end + if ( getValue('visus.uden_korr.etdrs.ou') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.ou') .. '\n' + end + end + return out @@ -185,6 +236,93 @@ end return true + + + + + + + + + + @@ -226,9 +373,6 @@ - - -