diff options
Diffstat (limited to 'server/xml/macros/autorefraktion-1.0.xml')
| -rw-r--r-- | server/xml/macros/autorefraktion-1.0.xml | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/server/xml/macros/autorefraktion-1.0.xml b/server/xml/macros/autorefraktion-1.0.xml index a4e882e..756129b 100644 --- a/server/xml/macros/autorefraktion-1.0.xml +++ b/server/xml/macros/autorefraktion-1.0.xml @@ -2,31 +2,31 @@ <macro name="autorefraktion" version="1.0"> <resume language="lua"> out = '' - if ( getValue('autorefractor.mangler.odxt') == '' ) + if ( getValue('autorefraktion.mangler.odxt') == '' ) then - out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefractor.sfere.odxt') .. ' sf' - if ( getValue('autorefractor.cyl.odxt') ~= '' ) + out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefraktion.sf.odxt') .. ' sf' + if ( getValue('autorefraktion.cyl.odxt') ~= '' ) then - out = out .. ', ' .. getValue('autorefractor.cyl.odxt') .. ' cyl' + out = out .. ', ' .. getValue('autorefraktion.cyl.odxt') .. ' cyl' end - if ( getValue('autorefractor.grader.odxt') ~= '' ) + if ( getValue('autorefraktion.grader.odxt') ~= '' ) then - out = out .. ', ' .. getValue('autorefractor.grader.odxt') .. ' grader\n' + out = out .. ', ' .. getValue('autorefraktion.grader.odxt') .. ' grader\n' else out = out .. '\n' end end - if ( getValue('autorefractor.mangler.osin') == '' ) + if ( getValue('autorefraktion.mangler.osin') == '' ) then - out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefractor.sfere.osin') .. ' sf' - if ( getValue('autorefractor.cyl.osin') ~= '' ) + out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefraktion.sf.osin') .. ' sf' + if ( getValue('autorefraktion.cyl.osin') ~= '' ) then - out = out .. ', ' .. getValue('autorefractor.cyl.osin') .. ' cyl' + out = out .. ', ' .. getValue('autorefraktion.cyl.osin') .. ' cyl' end - if ( getValue('autorefractor.grader.osin') ~= '' ) + if ( getValue('autorefraktion.grader.osin') ~= '' ) then - out = out .. ', ' .. getValue('autorefractor.grader.osin') .. ' grader\n' + out = out .. ', ' .. getValue('autorefraktion.grader.osin') .. ' grader\n' else out = out .. '\n' end @@ -50,11 +50,11 @@ then value = '' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.source + source = missing_eye_odxt.kilde else value = 'mangler' timestamp = missing_eye_odxt.timestamp - source = missing_eye_odxt.source + source = missing_eye_odxt.kilde end end return value, timestamp, source @@ -70,11 +70,11 @@ then value = '' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.source + source = missing_eye_osin.kilde else value = 'mangler' timestamp = missing_eye_osin.timestamp - source = missing_eye_osin.source + source = missing_eye_osin.kilde end end return value, timestamp, source @@ -150,24 +150,24 @@ <!-- o.dxt --> <frame layout="vbox"> <checkbox caption="Der er ikke målt på o.dxt" - name="autorefractor.mangler.odxt" script="right_eye" + name="autorefraktion.mangler.odxt" script="right_eye" map="missing_eye_odxt_map" truevalue="mangler" falsevalue="" value=""/> <frame name="right_eye_frame" caption="o.dxt" layout="hbox"> <frame layout="vbox"> <label caption="Sf:"/> - <lineedit name="autorefractor.sfere.odxt" + <lineedit name="autorefraktion.sf.odxt" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/> </frame> <frame layout="vbox"> <label caption="Cyl:"/> - <lineedit name="autorefractor.cyl.odxt" + <lineedit name="autorefraktion.cyl.odxt" regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> - <lineedit name="autorefractor.grader.odxt" + <lineedit name="autorefraktion.grader.odxt" regexp="|[\d]+" script="lt359gt0" value=""/> </frame> @@ -177,24 +177,24 @@ <!-- o.sin --> <frame layout="vbox"> <checkbox caption="Der er ikke målt på o.sin" - name="autorefractor.mangler.osin" script="left_eye" + name="autorefraktion.mangler.osin" script="left_eye" map="missing_eye_osin_map" truevalue="mangler" falsevalue="" value=""/> <frame name="left_eye_frame" caption="o.sin" layout="hbox"> <frame layout="vbox"> <label caption="Sf:"/> - <lineedit name="autorefractor.sfere.osin" + <lineedit name="autorefraktion.sf.osin" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/> </frame> <frame layout="vbox"> <label caption="Cyl:"/> - <lineedit name="autorefractor.cyl.osin" + <lineedit name="autorefraktion.cyl.osin" regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> - <lineedit name="autorefractor.grader.osin" + <lineedit name="autorefraktion.grader.osin" regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> |