diff options
Diffstat (limited to 'server/xml/macros/oejentryk-1.0.xml')
| -rw-r--r-- | server/xml/macros/oejentryk-1.0.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/server/xml/macros/oejentryk-1.0.xml b/server/xml/macros/oejentryk-1.0.xml index fb6cca4..5bba613 100644 --- a/server/xml/macros/oejentryk-1.0.xml +++ b/server/xml/macros/oejentryk-1.0.xml @@ -22,17 +22,17 @@ if ( getValue('tonometer.mangler.odxt') == '' ) then - out = out .. 'o.dxt: ' .. getValue('tonometer.pressure.odxt') .. ' mmHg\n' + out = out .. 'o.dxt: ' .. getValue('tonometer.tryk.odxt') .. ' mmHg\n' end if ( getValue('tonometer.mangler.osin') == '' ) then - out = out .. 'o.sin: ' .. getValue('tonometer.pressure.odxt') .. ' mmHg\n' + out = out .. 'o.sin: ' .. getValue('tonometer.tryk.odxt') .. ' mmHg\n' end if ( getValue('tonometer.mangler.odxt') == '' or getValue('tonometer.mangler.osin') == '' ) then - out = out .. getValue('tonometer.device') .. '.\n' + out = out .. getValue('tonometer.apparat') .. '.\n' end return out @@ -53,11 +53,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 @@ -73,11 +73,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 @@ -147,7 +147,7 @@ <frame name="right_eye_frame" caption="o.dxt" layout="hbox"> <label caption="Tryk:"/> <spacer/> - <lineedit name="tonometer.pressure.odxt" regexp="\d{1,2}" script="lt80gt0" value=""/> + <lineedit name="tonometer.tryk.odxt" regexp="\d{1,2}" script="lt80gt0" value=""/> <label caption="mmHg"/> <spacer/> </frame> @@ -162,7 +162,7 @@ <frame name="left_eye_frame" caption="o.sin" layout="hbox"> <label caption="Tryk:"/> <spacer/> - <lineedit name="tonometer.pressure.osin" regexp="\d{1,2}" script="lt80gt0" value=""/> + <lineedit name="tonometer.tryk.osin" regexp="\d{1,2}" script="lt80gt0" value=""/> <label caption="mmHg"/> <spacer/> </frame> @@ -172,7 +172,7 @@ <frame name="device_frame" layout="vbox"> <label caption="Tonometer måling foretaget med:"/> - <combobox name="tonometer.device" value=""> + <combobox name="tonometer.apparat" value=""> <item caption="Applanationstonometer" value="Appl"/> <item caption="Lufttonometer" value="Luft"/> </combobox> |