diff options
Diffstat (limited to 'server/xml/macros/spaltelampe-1.0.xml')
| -rw-r--r-- | server/xml/macros/spaltelampe-1.0.xml | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/server/xml/macros/spaltelampe-1.0.xml b/server/xml/macros/spaltelampe-1.0.xml index 9c83001..4a3b76e 100644 --- a/server/xml/macros/spaltelampe-1.0.xml +++ b/server/xml/macros/spaltelampe-1.0.xml @@ -14,72 +14,72 @@ <macro name="spaltelampe" version="1.0"> <resume language="lua"> out = '' - if ( getValue('slit_lamp.odxt.missing') == '' or getValue('slit_lamp.osin.missing') == '' ) + if ( getValue('slit_lamp.mangler.odxt') == '' or getValue('slit_lamp.mangler.osin') == '' ) then out = out .. 'Spl:\n' end - if ( getValue('slit_lamp.odxt.missing') == '' ) + if ( getValue('slit_lamp.mangler.odxt') == '' ) then - out = out .. 'Linsen, højre side: ' .. getValue('slit_lamp.odxt.observation') .. '\n' - if ( getValue('slit_lamp.odxt.additional') ~= '' ) + out = out .. 'Linsen, højre side: ' .. getValue('slit_lamp.observation.odxt') .. '\n' + if ( getValue('slit_lamp.yderligere.odxt') ~= '' ) then - out = out .. 'Supplerende:\n' .. getValue('slit_lamp.odxt.additional') .. '\n' + out = out .. 'Supplerende:\n' .. getValue('slit_lamp.yderligere.odxt') .. '\n' end end - if ( getValue('slit_lamp.osin.missing') == '' ) + if ( getValue('slit_lamp.mangler.osin') == '' ) then - out = out .. 'Linsen, venstre side: ' .. getValue('slit_lamp.osin.observation') .. '\n' - if ( getValue('slit_lamp.osin.additional') ~= '' ) + out = out .. 'Linsen, venstre side: ' .. getValue('slit_lamp.observation.osin') .. '\n' + if ( getValue('slit_lamp.yderligere.osin') ~= '' ) then - out = out .. 'Supplerende:\n' .. getValue('slit_lamp.osin.additional') .. '\n' + out = out .. 'Supplerende:\n' .. getValue('slit_lamp.yderligere.osin') .. '\n' end end 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 @@ -113,8 +113,8 @@ <!-- o.dxt --> <frame layout="vbox"> <checkbox caption="Der er ikke målt på o.dxt" - name="slit_lamp.odxt.missing" script="right_eye" - map="missing_eye_right_map" + name="slit_lamp.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"> @@ -123,7 +123,7 @@ <label/> </frame> <frame layout="vbox"> - <altcombobox name="slit_lamp.odxt.observation" layout="vbox" value="Ingen katarakt"> + <altcombobox name="slit_lamp.observation.odxt" layout="vbox" value="Ingen katarakt"> <item caption="Ingen katarakt" value="Ingen katarakt"/> <item caption="Katarakt grad 1" value="Katarakt grad 1"/> <item caption="Katarakt grad 2" value="Katarakt grad 2"/> @@ -137,15 +137,15 @@ </frame> </frame> <label caption="Supplerende:"/> - <textedit name="slit_lamp.odxt.additional" value=""/> + <textedit name="slit_lamp.yderligere.odxt" value=""/> </frame> </frame> <!-- o.sin --> <frame layout="vbox"> <checkbox caption="Der er ikke målt på o.sin" - name="slit_lamp.osin.missing" script="left_eye" - map="missing_eye_left_map" + name="slit_lamp.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"> @@ -154,7 +154,7 @@ <label/> </frame> <frame layout="vbox"> - <altcombobox name="slit_lamp.osin.observation" layout="vbox" value="Ingen katarakt"> + <altcombobox name="slit_lamp.observation.osin" layout="vbox" value="Ingen katarakt"> <item caption="Ingen katarakt" value="Ingen katarakt"/> <item caption="Katarakt grad 1" value="Katarakt grad 1"/> <item caption="Katarakt grad 2" value="Katarakt grad 2"/> @@ -168,7 +168,7 @@ </frame> </frame> <label caption="Supplerende:"/> - <textedit name="slit_lamp.osin.additional" value=""/> + <textedit name="slit_lamp.yderligere.osin" value=""/> </frame> </frame> |