diff options
Diffstat (limited to 'server/xml/macros/manifest_refraktion-1.0.xml')
| -rw-r--r-- | server/xml/macros/manifest_refraktion-1.0.xml | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/server/xml/macros/manifest_refraktion-1.0.xml b/server/xml/macros/manifest_refraktion-1.0.xml index ba1216a..10afe07 100644 --- a/server/xml/macros/manifest_refraktion-1.0.xml +++ b/server/xml/macros/manifest_refraktion-1.0.xml @@ -2,19 +2,34 @@ <macro name="manifest_refraktion" version="1.0"> <resume language="lua"> out = '' - out = out .. 'Manifest refraktion:\n' if ( getValue('manifest_refraktion.right.missing') == '' ) then - out = out .. 'Højre øje: ' .. getValue('manifest_refraktion.right.sf') - .. ' sf, ' .. getValue('manifest_refraktion.right.cyl') .. ' x ' - .. getValue('manifest_refraktion.right.grader') .. '\n' + out = out .. 'Manifest refraktion, o.dxt: ' .. getValue('manifest_refraktion.right.sf') .. ' sf' + if ( getValue('manifest_refraktion.right.cyl') ~= '' ) + then + out = out .. ', ' .. getValue('manifest_refraktion.right.cyl') .. ' cyl' + end + if ( getValue('manifest_refraktion.right.grader') ~= '' ) + then + out = out .. ', ' .. getValue('manifest_refraktion.right.grader') .. ' grader\n' + else + out = out .. '\n' + end end if ( getValue('manifest_refraktion.left.missing') == '' ) then - out = out .. 'Venstre øje: ' .. getValue('manifest_refraktion.left.sf') - .. ' sf, ' .. getValue('manifest_refraktion.left.cyl') .. ' x ' - .. getValue('manifest_refraktion.left.grader') .. '\n' + out = out .. 'Manifest refraktion, o.sin: ' .. getValue('manifest_refraktion.left.sf') .. ' sf' + if ( getValue('manifest_refraktion.left.cyl') ~= '' ) + then + out = out .. ', ' .. getValue('manifest_refraktion.left.cyl') .. ' cyl' + end + if ( getValue('manifest_refraktion.left.grader') ~= '' ) + then + out = out .. ', ' .. getValue('manifest_refraktion.left.grader') .. ' grader\n' + else + out = out .. '\n' + end end return out @@ -80,7 +95,7 @@ <script language="lua" name="lt10gt-15"> if(value == '') then - return false + return true end value = string.gsub(value, ',', '.') @@ -94,7 +109,7 @@ <script language="lua" name="lt359gt0"> if(value == '') then - return false + return true end value = string.gsub(value, ',', '.') @@ -153,12 +168,12 @@ <frame layout="vbox"> <label caption="Cyl:"/> <lineedit name="manifest_refraktion.right.cyl" map="manifest_refraktion.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="manifest_refraktion.right.grader" map="manifest_refraktion.right.axis" - regexp="[\d]+" script="lt359gt0" value=""/> + regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> </frame> @@ -181,12 +196,12 @@ <frame layout="vbox"> <label caption="Cyl:"/> <lineedit name="manifest_refraktion.left.cyl" map="manifest_refraktion.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="manifest_refraktion.left.grader" map="manifest_refraktion.left.axis" - regexp="[\d]+" script="lt359gt0" value=""/> + regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> </frame> |