summaryrefslogtreecommitdiff
path: root/server/xml/macros/manifest_refraktion-1.0.xml
diff options
context:
space:
mode:
Diffstat (limited to 'server/xml/macros/manifest_refraktion-1.0.xml')
-rw-r--r--server/xml/macros/manifest_refraktion-1.0.xml68
1 files changed, 34 insertions, 34 deletions
diff --git a/server/xml/macros/manifest_refraktion-1.0.xml b/server/xml/macros/manifest_refraktion-1.0.xml
index aad11dd..5c0b90c 100644
--- a/server/xml/macros/manifest_refraktion-1.0.xml
+++ b/server/xml/macros/manifest_refraktion-1.0.xml
@@ -2,31 +2,31 @@
<macro name="manifest_refraktion" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('manifest_refraktion.odxt.missing') == '' )
+ if ( getValue('manifest_refraktion.mangler.odxt') == '' )
then
- out = out .. 'Manifest refraktion, o.dxt: ' .. getValue('manifest_refraktion.odxt.sf') .. ' sf'
- if ( getValue('manifest_refraktion.odxt.cyl') ~= '' )
+ out = out .. 'Manifest refraktion, o.dxt: ' .. getValue('manifest_refraktion.sf.odxt') .. ' sf'
+ if ( getValue('manifest_refraktion.cyl.odxt') ~= '' )
then
- out = out .. ', ' .. getValue('manifest_refraktion.odxt.cyl') .. ' cyl'
+ out = out .. ', ' .. getValue('manifest_refraktion.cyl.odxt') .. ' cyl'
end
- if ( getValue('manifest_refraktion.odxt.grader') ~= '' )
+ if ( getValue('manifest_refraktion.grader.odxt') ~= '' )
then
- out = out .. ', ' .. getValue('manifest_refraktion.odxt.grader') .. ' grader\n'
+ out = out .. ', ' .. getValue('manifest_refraktion.grader.odxt') .. ' grader\n'
else
out = out .. '\n'
end
end
- if ( getValue('manifest_refraktion.osin.missing') == '' )
+ if ( getValue('manifest_refraktion.mangler.osin') == '' )
then
- out = out .. 'Manifest refraktion, o.sin: ' .. getValue('manifest_refraktion.osin.sf') .. ' sf'
- if ( getValue('manifest_refraktion.osin.cyl') ~= '' )
+ out = out .. 'Manifest refraktion, o.sin: ' .. getValue('manifest_refraktion.sf.osin') .. ' sf'
+ if ( getValue('manifest_refraktion.cyl.osin') ~= '' )
then
- out = out .. ', ' .. getValue('manifest_refraktion.osin.cyl') .. ' cyl'
+ out = out .. ', ' .. getValue('manifest_refraktion.cyl.osin') .. ' cyl'
end
- if ( getValue('manifest_refraktion.osin.grader') ~= '' )
+ if ( getValue('manifest_refraktion.grader.osin') ~= '' )
then
- out = out .. ', ' .. getValue('manifest_refraktion.osin.grader') .. ' grader\n'
+ out = out .. ', ' .. getValue('manifest_refraktion.grader.osin') .. ' grader\n'
else
out = out .. '\n'
end
@@ -36,42 +36,42 @@
</resume>
<queries>
<query class="manifest_refraktion" ttl="100000"/>
- <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
+ timestamp = missing_eye_odxt.timestamp
else
value = 'mangler'
- timestamp = missing_eye_right.timestamp
+ timestamp = missing_eye_odxt.timestamp
end
end
return value, timestamp, source
</map>
- <map name="missing_eye_left_map">
+ <map name="missing_eye_osin_map">
value = 0
timestamp = 0
source = 'pracro'
- 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
+ timestamp = missing_eye_osin.timestamp
else
value = 'mangler'
- timestamp = missing_eye_left.timestamp
+ timestamp = missing_eye_osin.timestamp
end
end
return value, timestamp, source
@@ -154,25 +154,25 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="manifest_refraktion.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="manifest_refraktion.mangler.odxt" script="right_eye"
+ map="missing_eye_odxt_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="right_eye_frame" caption="o.dxt" layout="vbox">
<frame layout="hbox">
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="manifest_refraktion.odxt.sf" map="manifest_refraktion.odxt.sfere"
+ <lineedit name="manifest_refraktion.sf.odxt" map="manifest_refraktion.sfere.odxt"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="manifest_refraktion.odxt.cyl" map="manifest_refraktion.odxt.cyl"
+ <lineedit name="manifest_refraktion.cyl.odxt" map="manifest_refraktion.cyl.odxt"
regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="manifest_refraktion.odxt.grader" map="manifest_refraktion.odxt.grader"
+ <lineedit name="manifest_refraktion.grader.odxt" map="manifest_refraktion.grader.odxt"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
@@ -182,25 +182,25 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="manifest_refraktion.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="manifest_refraktion.mangler.osin" script="left_eye"
+ map="missing_eye_osin_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="left_eye_frame" caption="o.sin" layout="vbox">
<frame layout="hbox">
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="manifest_refraktion.osin.sf" map="manifest_refraktion.osin.sfere"
+ <lineedit name="manifest_refraktion.sf.osin" map="manifest_refraktion.sfere.osin"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="manifest_refraktion.osin.cyl" map="manifest_refraktion.osin.cyl"
+ <lineedit name="manifest_refraktion.cyl.osin" map="manifest_refraktion.cyl.osin"
regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="manifest_refraktion.osin.grader" map="manifest_refraktion.osin.grader"
+ <lineedit name="manifest_refraktion.grader.osin" map="manifest_refraktion.grader.osin"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 11:38:27 +0000