diff options
Diffstat (limited to 'server/xml/macros/autorefraktion-1.0.xml')
| -rw-r--r-- | server/xml/macros/autorefraktion-1.0.xml | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/server/xml/macros/autorefraktion-1.0.xml b/server/xml/macros/autorefraktion-1.0.xml index f5c1b3f..a4e882e 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.odxt.missing') == '' ) + if ( getValue('autorefractor.mangler.odxt') == '' ) then - out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefractor.odxt.sfere') .. ' sf' - if ( getValue('autorefractor.odxt.cyl') ~= '' ) + out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefractor.sfere.odxt') .. ' sf' + if ( getValue('autorefractor.cyl.odxt') ~= '' ) then - out = out .. ', ' .. getValue('autorefractor.odxt.cyl') .. ' cyl' + out = out .. ', ' .. getValue('autorefractor.cyl.odxt') .. ' cyl' end - if ( getValue('autorefractor.odxt.grader') ~= '' ) + if ( getValue('autorefractor.grader.odxt') ~= '' ) then - out = out .. ', ' .. getValue('autorefractor.odxt.grader') .. ' grader\n' + out = out .. ', ' .. getValue('autorefractor.grader.odxt') .. ' grader\n' else out = out .. '\n' end end - if ( getValue('autorefractor.osin.missing') == '' ) + if ( getValue('autorefractor.mangler.osin') == '' ) then - out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefractor.osin.sfere') .. ' sf' - if ( getValue('autorefractor.osin.cyl') ~= '' ) + out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefractor.sfere.osin') .. ' sf' + if ( getValue('autorefractor.cyl.osin') ~= '' ) then - out = out .. ', ' .. getValue('autorefractor.osin.cyl') .. ' cyl' + out = out .. ', ' .. getValue('autorefractor.cyl.osin') .. ' cyl' end - if ( getValue('autorefractor.osin.grader') ~= '' ) + if ( getValue('autorefractor.grader.osin') ~= '' ) then - out = out .. ', ' .. getValue('autorefractor.osin.grader') .. ' grader\n' + out = out .. ', ' .. getValue('autorefractor.grader.osin') .. ' grader\n' else out = out .. '\n' end @@ -35,46 +35,46 @@ return out </resume> <queries> - <query service="pracro" class="missing_eye_right" ttl="1000000"/> - <query service="pracro" class="missing_eye_left" ttl="1000000"/> + <query service="pracro" class="missing_eye_odxt" ttl="1000000"/> + <query service="pracro" class="missing_eye_osin" ttl="1000000"/> </queries> <maps> - <map name="missing_eye_right_map"> + <map name="missing_eye_odxt_map"> value = 0 timestamp = 0 source = '' - if( missing_eye_right ) + if( missing_eye_odxt ) then - if( missing_eye_right.value and missing_eye_right.value == '' ) + if( missing_eye_odxt.value and missing_eye_odxt.value == '' ) then value = '' - timestamp = missing_eye_right.timestamp - source = missing_eye_right.source + timestamp = missing_eye_odxt.timestamp + source = missing_eye_odxt.source else value = 'mangler' - timestamp = missing_eye_right.timestamp - source = missing_eye_right.source + timestamp = missing_eye_odxt.timestamp + source = missing_eye_odxt.source end end return value, timestamp, source </map> - <map name="missing_eye_left_map"> + <map name="missing_eye_osin_map"> value = 0 timestamp = 0 source = '' - if( missing_eye_left ) + if( missing_eye_osin ) then - if( missing_eye_left.value and missing_eye_left.value == '' ) + if( missing_eye_osin.value and missing_eye_osin.value == '' ) then value = '' - timestamp = missing_eye_left.timestamp - source = missing_eye_left.source + timestamp = missing_eye_osin.timestamp + source = missing_eye_osin.source else value = 'mangler' - timestamp = missing_eye_left.timestamp - source = missing_eye_left.source + timestamp = missing_eye_osin.timestamp + source = missing_eye_osin.source 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.odxt.missing" script="right_eye" - map="missing_eye_right_map" + name="autorefractor.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.odxt.sfere" + <lineedit name="autorefractor.sfere.odxt" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/> </frame> <frame layout="vbox"> <label caption="Cyl:"/> - <lineedit name="autorefractor.odxt.cyl" + <lineedit name="autorefractor.cyl.odxt" regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> - <lineedit name="autorefractor.odxt.grader" + <lineedit name="autorefractor.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.osin.missing" script="left_eye" - map="missing_eye_left_map" + name="autorefractor.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.osin.sfere" + <lineedit name="autorefractor.sfere.osin" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/> </frame> <frame layout="vbox"> <label caption="Cyl:"/> - <lineedit name="autorefractor.osin.cyl" + <lineedit name="autorefractor.cyl.osin" regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> - <lineedit name="autorefractor.osin.grader" + <lineedit name="autorefractor.grader.osin" regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> |