diff options
Diffstat (limited to 'server/xml/macros/autorefraktion-1.0.xml')
| -rw-r--r-- | server/xml/macros/autorefraktion-1.0.xml | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/server/xml/macros/autorefraktion-1.0.xml b/server/xml/macros/autorefraktion-1.0.xml index 54fd5bb..706300e 100644 --- a/server/xml/macros/autorefraktion-1.0.xml +++ b/server/xml/macros/autorefraktion-1.0.xml @@ -1,31 +1,35 @@ <?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. - --> -<!-- - 20090402: Bent Bisballe Nyeng - 'missing eye' tilføjet. - --> <macro name="autorefraktion" version="1.0"> <resume language="lua"> 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' + out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefractor.right.sphere') .. ' sf' + if ( getValue('autorefractor.right.cyl') ~= '' ) + then + out = out .. ', ' .. getValue('autorefractor.right.cyl') .. ' cyl' + end + if ( getValue('autorefractor.right.axis') ~= '' ) + then + out = out .. ', ' .. getValue('autorefractor.right.axis') .. ' grader\n' + else + out = out .. '\n' + end 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' + out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefractor.left.sphere') .. ' sf' + if ( getValue('autorefractor.left.cyl') ~= '' ) + then + out = out .. ', ' .. getValue('autorefractor.left.cyl') .. ' cyl' + end + if ( getValue('autorefractor.left.axis') ~= '' ) + then + out = out .. ', ' .. getValue('autorefractor.left.axis') .. ' grader\n' + else + out = out .. '\n' + end end return out @@ -94,7 +98,7 @@ <script language="lua" name="lt10gt-15"> if(value == '') then - return false + return true end value = string.gsub(value, ',', '.') @@ -108,7 +112,7 @@ <script language="lua" name="lt359gt0"> if(value == '') then - return false + return true end value = string.gsub(value, ',', '.') @@ -159,12 +163,12 @@ <frame layout="vbox"> <label caption="Cyl:"/> <lineedit name="autorefractor.right.cyl" - regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> + regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> <lineedit name="autorefractor.right.axis" - regexp="[\d]+" script="lt359gt0" value=""/> + regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> @@ -186,12 +190,12 @@ <frame layout="vbox"> <label caption="Cyl:"/> <lineedit name="autorefractor.left.cyl" - regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> + regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> <lineedit name="autorefractor.left.axis" - regexp="[\d]+" script="lt359gt0" value=""/> + regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> </frame> |