summaryrefslogtreecommitdiff
path: root/server/xml/macros
diff options
context:
space:
mode:
Diffstat (limited to 'server/xml/macros')
-rw-r--r--server/xml/macros/90d_linse-1.0.xml120
-rw-r--r--server/xml/macros/akselaengde-1.0.xml50
-rw-r--r--server/xml/macros/aktuelle-1.0.xml58
-rw-r--r--server/xml/macros/amd_behandlingsindikation-1.0.xml6
-rw-r--r--server/xml/macros/amd_genbehandlingsindikation-1.0.xml6
-rw-r--r--server/xml/macros/amd_procedure-1.0.xml4
-rw-r--r--server/xml/macros/autorefraktion-1.0.xml76
-rw-r--r--server/xml/macros/central_corneatykkelse-1.0.xml50
-rw-r--r--server/xml/macros/cycloplegisk_refraktion-1.0.xml68
-rw-r--r--server/xml/macros/egen_brille-1.0.xml116
-rw-r--r--server/xml/macros/example.xml12
-rw-r--r--server/xml/macros/fluorescens_faser-1.0.xml6
-rw-r--r--server/xml/macros/fluorescens_injektion-1.0.xml6
-rw-r--r--server/xml/macros/fluorescens_konklusion-1.0.xml2
-rw-r--r--server/xml/macros/gennemgang_af_de_5_trin-1.0.xml2
-rw-r--r--server/xml/macros/keratometri-1.0.xml60
-rw-r--r--server/xml/macros/manifest_refraktion-1.0.xml68
-rw-r--r--server/xml/macros/oct_konklusion-1.0.xml58
-rw-r--r--server/xml/macros/oct_maaling-1.0.xml54
-rw-r--r--server/xml/macros/oejentryk-1.0.xml52
-rw-r--r--server/xml/macros/pupilstoerrelse-1.0.xml50
-rw-r--r--server/xml/macros/ref-spaltelampe-1.0.xml294
-rw-r--r--server/xml/macros/ref_90d_linse-1.0.xml154
-rw-r--r--server/xml/macros/ref_behandling-kirurgisk_procedure-1.0.xml4
-rw-r--r--server/xml/macros/spaltelampe-1.0.xml66
-rw-r--r--server/xml/macros/spaltelampe-template-1.0.xml294
-rw-r--r--server/xml/macros/tidligere_oejensygdomme-1.0.xml8
-rw-r--r--server/xml/macros/tonometri-1.0.xml58
-rw-r--r--server/xml/macros/topografi-1.0.xml50
-rw-r--r--server/xml/macros/visus-1.0.xml82
-rw-r--r--server/xml/macros/visus-autoref-1.0.xml48
-rw-r--r--server/xml/macros/visus-egen_korr-1.0.xml46
-rw-r--r--server/xml/macros/visus-manifest_refraktion-1.0.xml46
-rw-r--r--server/xml/macros/visus-template-1.0.xml46
-rw-r--r--server/xml/macros/visus-uden_korr-1.0.xml46
-rw-r--r--server/xml/macros/yderligere_diagnostik-1.0.xml8
36 files changed, 1087 insertions, 1087 deletions
diff --git a/server/xml/macros/90d_linse-1.0.xml b/server/xml/macros/90d_linse-1.0.xml
index 4dbfe92..8a632c9 100644
--- a/server/xml/macros/90d_linse-1.0.xml
+++ b/server/xml/macros/90d_linse-1.0.xml
@@ -16,90 +16,90 @@
<resume language="lua">
out = '90D linse:'
- if ( getValue('90d_linse.odxt.missing') == '' and getValue('90d_linse.osin.missing') == '' )
+ if ( getValue('90d_linse.mangler.odxt') == '' and getValue('90d_linse.mangler.osin') == '' )
then
- out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.odxt.fundus_visibility')
- .. ' på o.dxt og ' .. getValue('90d_linse.osin.fundus_visibility')..' på venstre.\n'
+ out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.fundus_visibility.odxt')
+ .. ' på o.dxt og ' .. getValue('90d_linse.fundus_visibility.osin')..' på venstre.\n'
else
- if ( getValue('90d_linse.odxt.missing') == '' )
+ if ( getValue('90d_linse.mangler.odxt') == '' )
then
- out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.odxt.fundus_visibility')
+ out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.fundus_visibility.odxt')
.. ' på o.dxt.\n'
end
- if ( getValue('90d_linse.osin.missing') == '' )
+ if ( getValue('90d_linse.mangler.osin') == '' )
then
- out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.osin.fundus_visibility')
+ out = 'Inblikket til fundusbaggrunden er ' .. getValue('90d_linse.fundus_visibility.osin')
..' på o.sin.\n'
end
end
- if ( getValue('90d_linse.odxt.missing') == '' )
+ if ( getValue('90d_linse.mangler.odxt') == '' )
then
- if ( getValue('90d_linse.odxt.implikation') == 'retinal hævelse' )
+ if ( getValue('90d_linse.implikation.odxt') == 'retinal hævelse' )
then
out = out .. 'På o.dxt findes der retinal hævelse'
- if ( getValue('90d_linse.odxt.randbl') ~= '' and getValue('90d_linse.odxt.exsudater') ~= '')
+ if ( getValue('90d_linse.randbl.odxt') ~= '' and getValue('90d_linse.exsudater.odxt') ~= '')
then
out = out .. ' med randblødning og exhudater.\n'
end
- if ( getValue('90d_linse.odxt.randbl') == '' and getValue('90d_linse.odxt.exsudater') ~= '')
+ if ( getValue('90d_linse.randbl.odxt') == '' and getValue('90d_linse.exsudater.odxt') ~= '')
then
out = out .. ' med exhudater.\n'
end
- if ( getValue('90d_linse.odxt.randbl') ~= '' and getValue('90d_linse.odxt.exsudater') == '')
+ if ( getValue('90d_linse.randbl.odxt') ~= '' and getValue('90d_linse.exsudater.odxt') == '')
then
out = out .. ' med randblødning.\n'
end
- if ( getValue('90d_linse.odxt.randbl') == '' and getValue('90d_linse.odxt.exsudater') == '')
+ if ( getValue('90d_linse.randbl.odxt') == '' and getValue('90d_linse.exsudater.odxt') == '')
then
out = out .. '.\n'
end
end
- if ( getValue('90d_linse.odxt.implikation') == 'atrofi' )
+ if ( getValue('90d_linse.implikation.odxt') == 'atrofi' )
then
out = out .. 'På o.dxt findes der atrofi.\n'
end
end
- if ( getValue('90d_linse.osin.missing') == '' )
+ if ( getValue('90d_linse.mangler.osin') == '' )
then
- if ( getValue('90d_linse.osin.implikation') == 'retinal hævelse' )
+ if ( getValue('90d_linse.implikation.osin') == 'retinal hævelse' )
then
out = out .. 'På o.sin findes der retinal hævelse'
- if ( getValue('90d_linse.osin.randbl') ~= '' and getValue('90d_linse.osin.exsudater') ~= '')
+ if ( getValue('90d_linse.randbl.osin') ~= '' and getValue('90d_linse.exsudater.osin') ~= '')
then
out = out .. ' med randblødning og exhudater.\n'
end
- if ( getValue('90d_linse.osin.randbl') == '' and getValue('90d_linse.osin.exsudater') ~= '')
+ if ( getValue('90d_linse.randbl.osin') == '' and getValue('90d_linse.exsudater.osin') ~= '')
then
out = out .. ' med exhudater.\n'
end
- if ( getValue('90d_linse.osin.randbl') ~= '' and getValue('90d_linse.osin.exsudater') == '')
+ if ( getValue('90d_linse.randbl.osin') ~= '' and getValue('90d_linse.exsudater.osin') == '')
then
out = out .. ' med randblødning.\n'
end
- if ( getValue('90d_linse.osin.randbl') == '' and getValue('90d_linse.osin.exsudater') == '')
+ if ( getValue('90d_linse.randbl.osin') == '' and getValue('90d_linse.exsudater.osin') == '')
then
out = out .. '.\n'
end
end
- if ( getValue('90d_linse.osin.implikation') == 'atrofi' )
+ if ( getValue('90d_linse.implikation.osin') == 'atrofi' )
then
out = out .. 'På o.sin findes der atrofi.\n'
end
end
- if ( getValue('90d_linse.additional') ~= '' )
+ if ( getValue('90d_linse.yderligere') ~= '' )
then
- out = out .. getValue('90d_linse.additional') .. '\n'
+ out = out .. getValue('90d_linse.yderligere') .. '\n'
end
return out
@@ -107,42 +107,42 @@
<queries>
</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
@@ -167,21 +167,21 @@
end
return true
</script>
- <script language="lua" name="retinal_haevelse_right">
+ <script language="lua" name="retinal_haevelse_odxt">
if ( value == 'retinal hævelse' )
then
- enable('retinal_haevelse_right')
+ enable('retinal_haevelse_odxt')
else
- disable('retinal_haevelse_right')
+ disable('retinal_haevelse_odxt')
end
return true
</script>
- <script language="lua" name="retinal_haevelse_left">
+ <script language="lua" name="retinal_haevelse_osin">
if ( value == 'retinal hævelse' )
then
- enable('retinal_haevelse_left')
+ enable('retinal_haevelse_osin')
else
- disable('retinal_haevelse_left')
+ disable('retinal_haevelse_osin')
end
return true
</script>
@@ -194,30 +194,30 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="90d_linse.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="90d_linse.mangler.odxt" script="right_eye"
+ map="missing_eye_odxt_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="right_eye_frame" caption="o.dxt" layout="vbox">
<!-- Indblik -->
- <combobox name="90d_linse.odxt.fundus_visibility" value="">
+ <combobox name="90d_linse.fundus_visibility.odxt" value="">
<item caption="Klart" value="klart"/>
<item caption="Let sløret" value="let sløret"/>
<item caption="Meget sløret" value="meget sløret"/>
</combobox>
<!-- Observationer -->
- <radiobuttons name="90d_linse.odxt.implikation" value=" "
- script="retinal_haevelse_right">
+ <radiobuttons name="90d_linse.implikation.odxt" value=" "
+ script="retinal_haevelse_odxt">
<radiobutton caption="Retinal hævelse" value="retinal hævelse"/>
<radiobutton caption="Atrofi" value="atrofi"/>
<radiobutton caption="Andet (se suppl.)" value=""/>
</radiobuttons>
- <frame name="retinal_haevelse_right" layout="vbox">
- <checkbox name="90d_linse.odxt.randbl" caption="Randblødning"
+ <frame name="retinal_haevelse_odxt" layout="vbox">
+ <checkbox name="90d_linse.randbl.odxt" caption="Randblødning"
truevalue="randblødning" falsevalue="" value=""/>
- <checkbox name="90d_linse.odxt.exsudater" caption="Exsudater"
+ <checkbox name="90d_linse.exsudater.odxt" caption="Exsudater"
truevalue="exsudater" falsevalue="" value=""/>
</frame>
@@ -227,30 +227,30 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="90d_linse.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="90d_linse.mangler.osin" script="left_eye"
+ map="missing_eye_osin_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="left_eye_frame" caption="o.sin" layout="vbox">
<!-- Indblik -->
- <combobox name="90d_linse.osin.fundus_visibility" value="">
+ <combobox name="90d_linse.fundus_visibility.osin" value="">
<item caption="Klart" value="klart"/>
<item caption="Let sløret" value="let sløret"/>
<item caption="Meget sløret" value="meget sløret"/>
</combobox>
<!-- Observationer -->
- <radiobuttons name="90d_linse.osin.implikation" value=" "
- script="retinal_haevelse_left">
+ <radiobuttons name="90d_linse.implikation.osin" value=" "
+ script="retinal_haevelse_osin">
<radiobutton caption="Retinal hævelse" value="retinal hævelse"/>
<radiobutton caption="Atrofi" value="atrofi"/>
<radiobutton caption="Andet (se suppl.)" value=""/>
</radiobuttons>
- <frame name="retinal_haevelse_left" layout="vbox">
- <checkbox name="90d_linse.osin.randbl" caption="Randblødning"
+ <frame name="retinal_haevelse_osin" layout="vbox">
+ <checkbox name="90d_linse.randbl.osin" caption="Randblødning"
truevalue="randblødning" falsevalue="" value=""/>
- <checkbox name="90d_linse.osin.exsudater" caption="Exsudater"
+ <checkbox name="90d_linse.exsudater.osin" caption="Exsudater"
truevalue="exsudater" falsevalue="" value=""/>
</frame>
@@ -259,7 +259,7 @@
</frame>
<label caption="Supplerende:"/>
- <textedit name="90d_linse.additional" value=""/>
+ <textedit name="90d_linse.yderligere" value=""/>
<!-- Knapper -->
<frame layout="hbox">
diff --git a/server/xml/macros/akselaengde-1.0.xml b/server/xml/macros/akselaengde-1.0.xml
index 3492fbc..af42444 100644
--- a/server/xml/macros/akselaengde-1.0.xml
+++ b/server/xml/macros/akselaengde-1.0.xml
@@ -2,19 +2,19 @@
<macro name="akselaengde" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('akselaengde.odxt.missing') == '' or getValue('akselaengde.osin.missing') == '' )
+ if ( getValue('akselaengde.mangler.odxt') == '' or getValue('akselaengde.mangler.osin') == '' )
then
out = out .. 'Akselængde: ' .. getValue('akselaengde.method') .. '\n'
end
- if ( getValue('akselaengde.odxt.missing') == '' )
+ if ( getValue('akselaengde.mangler.odxt') == '' )
then
- out = out .. 'o.dxt: ' .. getValue('akselaengde.odxt.length') .. ' mm\n'
+ out = out .. 'o.dxt: ' .. getValue('akselaengde.laengde.odxt') .. ' mm\n'
end
- if ( getValue('akselaengde.osin.missing') == '' )
+ if ( getValue('akselaengde.mangler.osin') == '' )
then
- out = out .. 'o.sin: ' .. getValue('akselaengde.osin.length') .. ' mm\n'
+ out = out .. 'o.sin: ' .. getValue('akselaengde.laengde.osin') .. ' mm\n'
end
return out
@@ -22,42 +22,42 @@
<queries>
</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
@@ -105,14 +105,14 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="akselaengde.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="akselaengde.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="Akselængde:"/>
<frame layout="hbox">
- <lineedit name="akselaengde.odxt.length" script="lt40gt10"
+ <lineedit name="akselaengde.laengde.odxt" script="lt40gt10"
regexp="\d{1,2},\d{2}" value=""/>
<label caption="mm"/>
</frame>
@@ -123,14 +123,14 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="akselaengde.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="akselaengde.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="Akselængde:"/>
<frame layout="hbox">
- <lineedit name="akselaengde.osin.length" script="lt40gt10"
+ <lineedit name="akselaengde.laengde.osin" script="lt40gt10"
regexp="\d{1,2},\d{2}" value=""/>
<label caption="mm"/>
</frame>
diff --git a/server/xml/macros/aktuelle-1.0.xml b/server/xml/macros/aktuelle-1.0.xml
index e7fc522..076d483 100644
--- a/server/xml/macros/aktuelle-1.0.xml
+++ b/server/xml/macros/aktuelle-1.0.xml
@@ -24,27 +24,27 @@
<resume language="lua">
out = 'Aktuelle:\n'
- if ( getValue('current.symptoms.odxt') == '' and getValue('current.symptoms.osin') == '' )
+ if ( getValue('aktuelle.symptomer.odxt') == '' and getValue('aktuelle.symptomer.osin') == '' )
then
out = out .. 'ingen\n'
end
- if ( getValue('current.symptoms.odxt') ~= '' )
+ if ( getValue('aktuelle.symptomer.odxt') ~= '' )
then
out = out .. 'På o.dxt har der været\n'
- out = out .. getValue('current.symptoms.odxt') .. '\n'
+ out = out .. getValue('aktuelle.symptomer.odxt') .. '\n'
end
- if ( getValue('current.symptoms.osin') ~= '' )
+ if ( getValue('aktuelle.symptomer.osin') ~= '' )
then
out = out .. 'På o.sin har der været\n'
- out = out .. getValue('current.symptoms.osin') .. '\n'
+ out = out .. getValue('aktuelle.symptomer.osin') .. '\n'
end
- if ( getValue('current.symptoms.odxt') ~= '' or getValue('current.symptoms.osin') ~= '' )
+ if ( getValue('aktuelle.symptomer.odxt') ~= '' or getValue('aktuelle.symptomer.osin') ~= '' )
then
- out = out .. 'Symptomerne er opstået ' .. getValue('current.when')
- .. ' og efterfølgende ' .. getValue('current.then')
+ out = out .. 'Symptomerne er opstået ' .. getValue('aktuelle.when')
+ .. ' og efterfølgende ' .. getValue('aktuelle.then')
end
return out
@@ -59,7 +59,7 @@
</maps>
<scripts>
<script language="lua" name="evolution_enable">
- if( getValue('current.symptoms.odxt') ~= '' or getValue('current.symptoms.osin') ~= '' )
+ if( getValue('aktuelle.symptomer.odxt') ~= '' or getValue('aktuelle.symptomer.osin') ~= '' )
then
enable('evolution')
else
@@ -78,14 +78,14 @@
<frame layout="hbox">
<frame caption="Højre" layout="vbox">
- <multilist name="current.symptoms.odxt" value=""
- innerwidget="aktuelle_entry_right" script="evolution_enable">
+ <multilist name="aktuelle.symptomer.odxt" value=""
+ innerwidget="aktuelle_entry_odxt" script="evolution_enable">
- <metawidget name="aktuelle_entry_right" layout="hbox"
+ <metawidget name="aktuelle_entry_odxt" layout="hbox"
formatlanguage="lua"
format=
"
- days = (os.time() - tonumber(getValue('date_right'))) / (60 * 60 * 24)
+ days = (os.time() - tonumber(getValue('date_odxt'))) / (60 * 60 * 24)
num = 0
identifier = ''
suffix = ''
@@ -131,28 +131,28 @@
suffix = ''
end
- return getValue('observeret_right') .. ': igennem ' .. num .. ' '
+ return getValue('observeret_odxt') .. ': igennem ' .. num .. ' '
.. identifier .. suffix .. '.'
">
<frame layout="vbox">
<label caption="Observeret:"/>
- <altcombobox name="observeret_right" layout="vbox" value="Sløret syn">
+ <altcombobox name="observeret_odxt" layout="vbox" value="Sløret syn">
<item caption="Sløret syn" value="Sløret syn"/>
<item caption="Mørk plet i synsfeltet" value="Mørk plet i synsfeltet"/>
<item caption="Metamorfopsier" value="Metamorfopsier"/>
<item caption="Mikropsi" value="Mikropsi"/>
<item caption="Dyskromatopsi" value="Dyskromatopsi"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="andet_right">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="andet_odxt">
<label caption="Andet:"/>
- <lineedit name="andet_right" value=""/>
+ <lineedit name="andet_odxt" value=""/>
</altitem>
</altcombobox>
</frame>
<frame layout="vbox">
<label caption="Dato:"/>
- <datetime name="date_right" fuzziness="3" map="now"/>
+ <datetime name="date_odxt" fuzziness="3" map="now"/>
<label caption=""/>
</frame>
@@ -162,14 +162,14 @@
</frame>
<frame caption="Venstre" layout="vbox">
- <multilist name="current.symptoms.osin" value=""
- innerwidget="aktuelle_entry_left" script="evolution_enable">
+ <multilist name="aktuelle.symptomer.osin" value=""
+ innerwidget="aktuelle_entry_osin" script="evolution_enable">
- <metawidget name="aktuelle_entry_left" layout="hbox"
+ <metawidget name="aktuelle_entry_osin" layout="hbox"
formatlanguage="lua"
format=
"
- days = (os.time() - tonumber(getValue('date_left'))) / (60 * 60 * 24)
+ days = (os.time() - tonumber(getValue('date_osin'))) / (60 * 60 * 24)
num = 0
identifier = ''
suffix = ''
@@ -215,28 +215,28 @@
suffix = ''
end
- return getValue('observeret_left') .. ': igennem ' .. num .. ' '
+ return getValue('observeret_osin') .. ': igennem ' .. num .. ' '
.. identifier .. suffix .. '.'
">
<frame layout="vbox">
<label caption="Observeret:"/>
- <altcombobox name="observeret_left" layout="vbox" value="Sløret syn">
+ <altcombobox name="observeret_osin" layout="vbox" value="Sløret syn">
<item caption="Sløret syn" value="Sløret syn"/>
<item caption="Mørk plet i synsfeltet" value="Mørk plet i synsfeltet"/>
<item caption="Metamorfopsier" value="Metamorfopsier"/>
<item caption="Mikropsi" value="Mikropsi"/>
<item caption="Dyskromatopsi" value="Dyskromatopsi"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="andet_left">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="andet_osin">
<label caption="Andet:"/>
- <lineedit name="andet_left" value=""/>
+ <lineedit name="andet_osin" value=""/>
</altitem>
</altcombobox>
</frame>
<frame layout="vbox">
<label caption="Dato:"/>
- <datetime name="date_left" fuzziness="3" map="now"/>
+ <datetime name="date_osin" fuzziness="3" map="now"/>
<label caption=""/>
</frame>
@@ -252,7 +252,7 @@
<frame layout="vbox">
<label caption="Opstået:"/>
- <radiobuttons name="current.when" value="." layout="hbox">
+ <radiobuttons name="aktuelle.when" value="." layout="hbox">
<radiobutton caption="Pludseligt"
value="pludseligt"/>
<radiobutton caption="Gradvist"
@@ -263,7 +263,7 @@
<frame layout="vbox">
<label caption="Efterfølgende:"/>
- <combobox name="current.then" value="og har efterfølgende været uændrede">
+ <combobox name="aktuelle.then" value="og har efterfølgende været uændrede">
<item caption="Uændret" value="uændrede"/>
<item caption="Forværret" value="forværret"/>
<item caption="Forbedret" value="forbedret"/>
diff --git a/server/xml/macros/amd_behandlingsindikation-1.0.xml b/server/xml/macros/amd_behandlingsindikation-1.0.xml
index 1bb1d2b..a963184 100644
--- a/server/xml/macros/amd_behandlingsindikation-1.0.xml
+++ b/server/xml/macros/amd_behandlingsindikation-1.0.xml
@@ -4,7 +4,7 @@
Ændret til nyt format i resume og naming scheme.
-->
<macro name="amd_behandlingsindikation" version="1.0">
- <resume>${amd.indication} ${amd.indication.eye}</resume>
+ <resume>${amd.indikation} ${amd.indikation.oeje}</resume>
<queries>
</queries>
<maps>
@@ -16,7 +16,7 @@
<frame layout="hbox">
<label caption="Øje:" width="50"/>
- <radiobuttons name="amd.indication.eye" value="">
+ <radiobuttons name="amd.indikation.oeje" value="">
<radiobutton caption="o.dxt" value="o.dxt"/>
<radiobutton caption="o.sin" value="o.sin"/>
</radiobuttons>
@@ -25,7 +25,7 @@
<frame layout="vbox">
<label caption="Der findes indikation for:"/>
- <combobox name="amd.indication" value="">
+ <combobox name="amd.indikation" value="">
<item caption="PDT" value="Der findes indikation for PDT behandling."/>
<item caption="Argon laser" value="Der findes indikation for argon laser behandling."/>
<item caption="Intravitreal angiostatisk behandling" value="Der findes indikation for intravitreal angiostatisk behandling."/>
diff --git a/server/xml/macros/amd_genbehandlingsindikation-1.0.xml b/server/xml/macros/amd_genbehandlingsindikation-1.0.xml
index ca988b1..91d0d7e 100644
--- a/server/xml/macros/amd_genbehandlingsindikation-1.0.xml
+++ b/server/xml/macros/amd_genbehandlingsindikation-1.0.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<macro name="amd_genbehandlingsindikation" version="1.0">
- <resume>${amd.indication} ${amd.indication.eye}</resume>
+ <resume>${amd.indikation} ${amd.indikation.oeje}</resume>
<queries>
</queries>
<maps>
@@ -12,7 +12,7 @@
<frame layout="hbox">
<label caption="Øje:" width="50"/>
- <radiobuttons name="amd.indication.eye" value="">
+ <radiobuttons name="amd.indikation.oeje" value="">
<radiobutton caption="o.dxt" value="o.dxt"/>
<radiobutton caption="o.sin" value="o.sin"/>
</radiobuttons>
@@ -21,7 +21,7 @@
<frame layout="vbox">
<label caption="Der findes indikation for:"/>
- <combobox name="amd.indication" value="">
+ <combobox name="amd.indikation" value="">
<item caption="Der findes indikation for at gentage behandlingen."
value="Der findes indikation for at gentage behandlingen."/>
<item caption="Der holdes pause med behandlingen."
diff --git a/server/xml/macros/amd_procedure-1.0.xml b/server/xml/macros/amd_procedure-1.0.xml
index 6fbde6e..9613202 100644
--- a/server/xml/macros/amd_procedure-1.0.xml
+++ b/server/xml/macros/amd_procedure-1.0.xml
@@ -6,7 +6,7 @@ vædet i Lidokain 20 mg/ml med Adrenalin.
Injektionsstedet nedadtil temporalt i konjunktiva 3,5 mm fra limbus
afmærkes med passer. Gennem 30 gauge kanyle gives 0,05 ml:
-Lucentis ${lucentis_treatment.eye}
+Lucentis ${lucentis_treatment.oeje}
Der dryppes med oculoguttae Tobrex over injektionsstedet.
Herefter medgives oculoguttae Tobrex til drypning x 2 i 2 døgn i det
@@ -26,7 +26,7 @@ behandling.
Injektionsstedet nedadtil temporalt i konjunktiva afmærkes med passer 3,5 mm fra limbus."/>
<frame layout="hbox">
<label width="250" caption="Med 30 gauge kanyle gives 0,05 ml Lucentis"/>
- <radiobuttons name="lucentis_treatment.eye">
+ <radiobuttons name="lucentis_treatment.oeje">
<radiobutton value="o.dxt" caption="o.dxt"/>
<radiobutton value="o.sin" caption="o.sin"/>
</radiobuttons>
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>
diff --git a/server/xml/macros/central_corneatykkelse-1.0.xml b/server/xml/macros/central_corneatykkelse-1.0.xml
index 12ef584..2abf1c7 100644
--- a/server/xml/macros/central_corneatykkelse-1.0.xml
+++ b/server/xml/macros/central_corneatykkelse-1.0.xml
@@ -2,19 +2,19 @@
<macro name="central_corneatykkelse" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('central_corneatykkelse.odxt.missing') == '' or getValue('central_corneatykkelse.osin.missing') == '' )
+ if ( getValue('central_corneatykkelse.mangler.odxt') == '' or getValue('central_corneatykkelse.mangler.osin') == '' )
then
out = out .. 'Central corneatykkelse, ' .. getValue('central_corneatykkelse.method') .. ':\n'
end
- if ( getValue('central_corneatykkelse.odxt.missing') == '' )
+ if ( getValue('central_corneatykkelse.mangler.odxt') == '' )
then
- out = out .. 'o.dxt: ' .. getValue('central_corneatykkelse.odxt.thickness') .. ' mm\n'
+ out = out .. 'o.dxt: ' .. getValue('central_corneatykkelse.thickness.odxt') .. ' mm\n'
end
- if ( getValue('central_corneatykkelse.osin.missing') == '' )
+ if ( getValue('central_corneatykkelse.mangler.osin') == '' )
then
- out = out .. 'o.sin: ' .. getValue('central_corneatykkelse.osin.thickness') .. ' mm\n'
+ out = out .. 'o.sin: ' .. getValue('central_corneatykkelse.thickness.osin') .. ' mm\n'
end
return out
@@ -22,42 +22,42 @@
<queries>
</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
@@ -105,14 +105,14 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="central_corneatykkelse.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="central_corneatykkelse.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="Tykkelse:"/>
<frame layout="hbox">
- <lineedit name="central_corneatykkelse.odxt.thickness" script="lt1gt0"
+ <lineedit name="central_corneatykkelse.thickness.odxt" script="lt1gt0"
regexp="\d{1},\d{3}" value=""/>
<label caption="mm"/>
</frame>
@@ -123,14 +123,14 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="central_corneatykkelse.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="central_corneatykkelse.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="Tykkelse:"/>
<frame layout="hbox">
- <lineedit name="central_corneatykkelse.osin.thickness" script="lt1gt0"
+ <lineedit name="central_corneatykkelse.thickness.osin" script="lt1gt0"
regexp="\d{1},\d{3}" value=""/>
<label caption="mm"/>
</frame>
diff --git a/server/xml/macros/cycloplegisk_refraktion-1.0.xml b/server/xml/macros/cycloplegisk_refraktion-1.0.xml
index 5653b88..697ed47 100644
--- a/server/xml/macros/cycloplegisk_refraktion-1.0.xml
+++ b/server/xml/macros/cycloplegisk_refraktion-1.0.xml
@@ -2,31 +2,31 @@
<macro name="cycloplegisk_refraktion" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('cycloplegisk_refraktion.odxt.missing') == '' )
+ if ( getValue('cycloplegisk_refraktion.mangler.odxt') == '' )
then
- out = out .. 'Cycloplegisk refraktion, o.dxt: ' .. getValue('cycloplegisk_refraktion.odxt.sf') .. ' sf'
- if ( getValue('cycloplegisk_refraktion.odxt.cyl') ~= '' )
+ out = out .. 'Cycloplegisk refraktion, o.dxt: ' .. getValue('cycloplegisk_refraktion.sf.odxt') .. ' sf'
+ if ( getValue('cycloplegisk_refraktion.cyl.odxt') ~= '' )
then
- out = out .. ', ' .. getValue('cycloplegisk_refraktion.odxt.cyl') .. ' cyl'
+ out = out .. ', ' .. getValue('cycloplegisk_refraktion.cyl.odxt') .. ' cyl'
end
- if ( getValue('cycloplegisk_refraktion.odxt.grader') ~= '' )
+ if ( getValue('cycloplegisk_refraktion.grader.odxt') ~= '' )
then
- out = out .. ', ' .. getValue('cycloplegisk_refraktion.odxt.grader') .. ' grader\n'
+ out = out .. ', ' .. getValue('cycloplegisk_refraktion.grader.odxt') .. ' grader\n'
else
out = out .. '\n'
end
end
- if ( getValue('cycloplegisk_refraktion.osin.missing') == '' )
+ if ( getValue('cycloplegisk_refraktion.mangler.osin') == '' )
then
- out = out .. 'Cycloplegisk refraktion, o.sin: ' .. getValue('cycloplegisk_refraktion.osin.sf') .. ' sf'
- if ( getValue('cycloplegisk_refraktion.osin.cyl') ~= '' )
+ out = out .. 'Cycloplegisk refraktion, o.sin: ' .. getValue('cycloplegisk_refraktion.sf.osin') .. ' sf'
+ if ( getValue('cycloplegisk_refraktion.cyl.osin') ~= '' )
then
- out = out .. ', ' .. getValue('cycloplegisk_refraktion.osin.cyl') .. ' cyl'
+ out = out .. ', ' .. getValue('cycloplegisk_refraktion.cyl.osin') .. ' cyl'
end
- if ( getValue('cycloplegisk_refraktion.osin.grader') ~= '' )
+ if ( getValue('cycloplegisk_refraktion.grader.osin') ~= '' )
then
- out = out .. ', ' .. getValue('cycloplegisk_refraktion.osin.grader') .. ' grader\n'
+ out = out .. ', ' .. getValue('cycloplegisk_refraktion.grader.osin') .. ' grader\n'
else
out = out .. '\n'
end
@@ -36,42 +36,42 @@
</resume>
<queries>
<query class="cycloplegisk_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 = 'pracro'
- 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
@@ -147,24 +147,24 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="cycloplegisk_refraktion.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="cycloplegisk_refraktion.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="cycloplegisk_refraktion.odxt.sf" map="cycloplegisk_refraktion.odxt.sfere"
+ <lineedit name="cycloplegisk_refraktion.sf.odxt" map="cycloplegisk_refraktion.sfere.odxt"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="cycloplegisk_refraktion.odxt.cyl" map="cycloplegisk_refraktion.odxt.cyl"
+ <lineedit name="cycloplegisk_refraktion.cyl.odxt" map="cycloplegisk_refraktion.cyl.odxt"
regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="cycloplegisk_refraktion.odxt.grader" map="cycloplegisk_refraktion.odxt.grader"
+ <lineedit name="cycloplegisk_refraktion.grader.odxt" map="cycloplegisk_refraktion.grader.odxt"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
@@ -173,24 +173,24 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="cycloplegisk_refraktion.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="cycloplegisk_refraktion.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="cycloplegisk_refraktion.osin.sf" map="cycloplegisk_refraktion.osin.sfere"
+ <lineedit name="cycloplegisk_refraktion.sf.osin" map="cycloplegisk_refraktion.sfere.osin"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="cycloplegisk_refraktion.osin.cyl" map="cycloplegisk_refraktion.osin.cyl"
+ <lineedit name="cycloplegisk_refraktion.cyl.osin" map="cycloplegisk_refraktion.cyl.osin"
regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="cycloplegisk_refraktion.osin.grader" map="cycloplegisk_refraktion.osin.grader"
+ <lineedit name="cycloplegisk_refraktion.grader.osin" map="cycloplegisk_refraktion.grader.osin"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
diff --git a/server/xml/macros/egen_brille-1.0.xml b/server/xml/macros/egen_brille-1.0.xml
index 7c0edae..4143e3d 100644
--- a/server/xml/macros/egen_brille-1.0.xml
+++ b/server/xml/macros/egen_brille-1.0.xml
@@ -2,31 +2,31 @@
<macro name="egen_brille" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('lensmeter.odxt.missing') == '' )
+ if ( getValue('brillemaaler.mangler.odxt') == '' )
then
- out = out .. 'Egen brille, o.dxt: ' .. getValue('lensmeter.odxt.sf') .. ' sf'
- if ( getValue('lensmeter.odxt.cyl') ~= '' )
+ out = out .. 'Egen brille, o.dxt: ' .. getValue('brillemaaler.sf.odxt') .. ' sf'
+ if ( getValue('brillemaaler.cyl.odxt') ~= '' )
then
- out = out .. ', ' .. getValue('lensmeter.odxt.cyl') .. ' cyl'
+ out = out .. ', ' .. getValue('brillemaaler.cyl.odxt') .. ' cyl'
end
- if ( getValue('lensmeter.odxt.grader') ~= '' )
+ if ( getValue('brillemaaler.grader.odxt') ~= '' )
then
- out = out .. ', ' .. getValue('lensmeter.odxt.grader') .. ' grader\n'
+ out = out .. ', ' .. getValue('brillemaaler.grader.odxt') .. ' grader\n'
else
out = out .. '\n'
end
end
- if ( getValue('lensmeter.osin.missing') == '' )
+ if ( getValue('brillemaaler.mangler.osin') == '' )
then
- out = out .. 'Egen brille, o.sin: ' .. getValue('lensmeter.osin.sf') .. ' sf'
- if ( getValue('lensmeter.osin.cyl') ~= '' )
+ out = out .. 'Egen brille, o.sin: ' .. getValue('brillemaaler.sf.osin') .. ' sf'
+ if ( getValue('brillemaaler.cyl.osin') ~= '' )
then
- out = out .. ', ' .. getValue('lensmeter.osin.cyl') .. ' cyl'
+ out = out .. ', ' .. getValue('brillemaaler.cyl.osin') .. ' cyl'
end
- if ( getValue('lensmeter.osin.grader') ~= '' )
+ if ( getValue('brillemaaler.grader.osin') ~= '' )
then
- out = out .. ', ' .. getValue('lensmeter.osin.grader') .. ' grader\n'
+ out = out .. ', ' .. getValue('brillemaaler.grader.osin') .. ' grader\n'
else
out = out .. '\n'
end
@@ -36,111 +36,111 @@
</resume>
<queries>
<query class="lensmeter" 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
- 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
</map>
- <map name="lensmeter.osin.sf">
+ <map name="brillemaaler.sf.osin">
-- Returning 0, 0 invalidates the result
value = 0
timestamp = 0
source = 0
- if(lensmeter and lensmeter.osin and lensmeter.osin.sf and lensmeter.osin.sf.value and lensmeter.osin.sf.timestamp)
+ if(lensmeter and brillemaaler.osin and brillemaaler.sf.osin and brillemaaler.sf.value.osin and brillemaaler.sf.timestamp.osin)
then
- value = lensmeter.osin.sf.value
+ value = brillemaaler.sf.value.osin
-- convert . to ,
value = string.gsub(value, '[.]', ',')
- timestamp = lensmeter.osin.sf.timestamp
- source = lensmeter.osin.sf.source
+ timestamp = brillemaaler.sf.timestamp.osin
+ source = brillemaaler.sf.source.osin
end
return value, timestamp, source
</map>
- <map name="lensmeter.osin.cyl">
+ <map name="brillemaaler.cyl.osin">
-- Returning 0, 0 invalidates the result
value = 0
timestamp = 0
source = 0
- if(lensmeter and lensmeter.osin and lensmeter.osin.cyl and lensmeter.osin.cyl.value and lensmeter.osin.cyl.timestamp)
+ if(lensmeter and brillemaaler.osin and brillemaaler.cyl.osin and brillemaaler.cyl.value.osin and brillemaaler.cyl.timestamp.osin)
then
- value = lensmeter.osin.cyl.value
+ value = brillemaaler.cyl.value.osin
-- convert . to ,
value = string.gsub(value, '[.]', ',')
- timestamp = lensmeter.osin.cyl.timestamp
- source = lensmeter.osin.cyl.source
+ timestamp = brillemaaler.cyl.timestamp.osin
+ source = brillemaaler.cyl.source.osin
end
return value, timestamp, source
</map>
- <map name="lensmeter.odxt.sf">
+ <map name="brillemaaler.sf.odxt">
-- Returning 0, 0 invalidates the result
value = 0
timestamp = 0
source = 0
- if(lensmeter and lensmeter.odxt and lensmeter.odxt.sf and lensmeter.odxt.sf.value and lensmeter.odxt.sf.timestamp)
+ if(lensmeter and brillemaaler.odxt and brillemaaler.sf.odxt and brillemaaler.sf.value.odxt and brillemaaler.sf.timestamp.odxt)
then
- value = lensmeter.odxt.sf.value
+ value = brillemaaler.sf.value.odxt
-- convert . to ,
value = string.gsub(value, '[.]', ',')
- timestamp = lensmeter.odxt.sf.timestamp
- source = lensmeter.odxt.sf.source
+ timestamp = brillemaaler.sf.timestamp.odxt
+ source = brillemaaler.sf.source.odxt
end
return value, timestamp, source
</map>
- <map name="lensmeter.odxt.cyl">
+ <map name="brillemaaler.cyl.odxt">
-- Returning 0, 0 invalidates the result
value = 0
timestamp = 0
source = 0
- if(lensmeter and lensmeter.odxt and lensmeter.odxt.cyl and lensmeter.odxt.cyl.value and lensmeter.odxt.cyl.timestamp)
+ if(lensmeter and brillemaaler.odxt and brillemaaler.cyl.odxt and brillemaaler.cyl.value.odxt and brillemaaler.cyl.timestamp.odxt)
then
- value = lensmeter.odxt.cyl.value
+ value = brillemaaler.cyl.value.odxt
-- convert . to ,
value = string.gsub(value, '[.]', ',')
- timestamp = lensmeter.odxt.cyl.timestamp
- source = lensmeter.odxt.cyl.source
+ timestamp = brillemaaler.cyl.timestamp.odxt
+ source = brillemaaler.cyl.source.odxt
end
return value, timestamp, source
</map>
@@ -215,24 +215,24 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="lensmeter.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="brillemaaler.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="lensmeter.odxt.sf" map="lensmeter.odxt.sf"
+ <lineedit name="brillemaaler.sf.odxt" map="brillemaaler.sf.odxt"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="lensmeter.odxt.cyl" map="lensmeter.odxt.cyl"
+ <lineedit name="brillemaaler.cyl.odxt" map="brillemaaler.cyl.odxt"
regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="lensmeter.odxt.grader" map="lensmeter.odxt.grader"
+ <lineedit name="brillemaaler.grader.odxt" map="brillemaaler.grader.odxt"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
@@ -241,24 +241,24 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="lensmeter.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="brillemaaler.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="lensmeter.osin.sf" map="lensmeter.osin.sf"
+ <lineedit name="brillemaaler.sf.osin" map="brillemaaler.sf.osin"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="lensmeter.osin.cyl" map="lensmeter.osin.cyl"
+ <lineedit name="brillemaaler.cyl.osin" map="brillemaaler.cyl.osin"
regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="lensmeter.osin.grader" map="lensmeter.osin.grader"
+ <lineedit name="brillemaaler.grader.osin" map="brillemaaler.grader.osin"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
diff --git a/server/xml/macros/example.xml b/server/xml/macros/example.xml
index d9710ec..eef6a18 100644
--- a/server/xml/macros/example.xml
+++ b/server/xml/macros/example.xml
@@ -16,13 +16,13 @@
-- Check for the existence of each level.
if( lensmeter and
- lensmeter.odxt and
- lensmeter.odxt.cyl and
- lensmeter.odxt.cyl.value and
- lensmeter.odxt.cyl.timestamp )
+ brillemaaler.odxt and
+ brillemaaler.cyl.odxt and
+ brillemaaler.cyl.value.odxt and
+ brillemaaler.cyl.timestamp.odxt )
then
- timestamp = lensmeter.odxt.cyl.value
- value = lensmeter.odxt.cyl.value
+ timestamp = brillemaaler.cyl.value.odxt
+ value = brillemaaler.cyl.value.odxt
end
return value, timestamp, source
diff --git a/server/xml/macros/fluorescens_faser-1.0.xml b/server/xml/macros/fluorescens_faser-1.0.xml
index ba0199f..e2a623f 100644
--- a/server/xml/macros/fluorescens_faser-1.0.xml
+++ b/server/xml/macros/fluorescens_faser-1.0.xml
@@ -10,7 +10,7 @@ Svarende til det retinale ødem ses der i de tidlige faser
${fluorescens.early_fases}.
Gennem de angiografiske faser udvikles der
-${fluorescens.angiografic_fases}.</resume>
+${fluorescens.angiografi_faser}.</resume>
<queries>
</queries>
<maps>
@@ -24,7 +24,7 @@ ${fluorescens.angiografic_fases}.</resume>
<frame layout="hbox">
<label caption="Øje:" width="50"/>
- <radiobuttons name="fluorescens.eye" value="">
+ <radiobuttons name="fluorescens.oeje" value="">
<radiobutton caption="o.dxt" value="o.dxt"/>
<radiobutton caption="o.sin" value="o.sin"/>
</radiobuttons>
@@ -39,7 +39,7 @@ ${fluorescens.angiografic_fases}.</resume>
</combobox>
<label caption="Angiografiske faser:" />
- <altcombobox name="fluorescens.angiografic_fases"
+ <altcombobox name="fluorescens.angiografi_faser"
value="ingen ændringer i fluorescensen" layout="vbox">
<item caption="Ingen ændringer i fluorescensen"
value="ingen ændringer i fluorescensen" />
diff --git a/server/xml/macros/fluorescens_injektion-1.0.xml b/server/xml/macros/fluorescens_injektion-1.0.xml
index e011194..dffdb4d 100644
--- a/server/xml/macros/fluorescens_injektion-1.0.xml
+++ b/server/xml/macros/fluorescens_injektion-1.0.xml
@@ -5,7 +5,7 @@
-->
<macro name="fluorescens_injektion" version="1.0">
<resume>I henhold til ovenstående ordination foretages der fluorescein angiografi efter afdelingens retningslinier.
-Injektion af fluorescein ved: ${fluorescein_injection.initials}</resume>
+Injektion af fluorescein ved: ${fluorescens_injektion.initials}</resume>
<queries>
</queries>
<maps>
@@ -19,7 +19,7 @@ Injektion af fluorescein ved: ${fluorescein_injection.initials}</resume>
<frame layout="hbox">
<label caption="Øje:" width="50"/>
- <radiobuttons name="fluorescein_injection.eye" value="">
+ <radiobuttons name="fluorescens_injektion.oeje" value="">
<radiobutton caption="o.dxt" value="o.dxt"/>
<radiobutton caption="o.sin" value="o.sin"/>
</radiobuttons>
@@ -28,7 +28,7 @@ Injektion af fluorescein ved: ${fluorescein_injection.initials}</resume>
<frame layout="hbox">
<label width="300" caption="Fluorescein injektion foretaget af (initialer):"/>
- <lineedit name="fluorescein_injection.initials" regexp="[a-zæøåA-ZÆØÅ]{2,5}" value=""/>
+ <lineedit name="fluorescens_injektion.initials" regexp="[a-zæøåA-ZÆØÅ]{2,5}" value=""/>
<spacer />
</frame>
diff --git a/server/xml/macros/fluorescens_konklusion-1.0.xml b/server/xml/macros/fluorescens_konklusion-1.0.xml
index 635f43e..b8b6235 100644
--- a/server/xml/macros/fluorescens_konklusion-1.0.xml
+++ b/server/xml/macros/fluorescens_konklusion-1.0.xml
@@ -66,7 +66,7 @@
<frame layout="hbox">
<label caption="Øje:" width="50"/>
- <radiobuttons name="fluorescens.konklusion.eye" value="">
+ <radiobuttons name="fluorescens.konklusion.oeje" value="">
<radiobutton caption="o.dxt" value="o.dxt"/>
<radiobutton caption="o.sin" value="o.sin"/>
</radiobuttons>
diff --git a/server/xml/macros/gennemgang_af_de_5_trin-1.0.xml b/server/xml/macros/gennemgang_af_de_5_trin-1.0.xml
index e908404..2355f8f 100644
--- a/server/xml/macros/gennemgang_af_de_5_trin-1.0.xml
+++ b/server/xml/macros/gennemgang_af_de_5_trin-1.0.xml
@@ -16,7 +16,7 @@
</scripts>
<widgets caption="Gennemgang af de 5 trin (B.3.1.2)" layout="vbox">
<frame layout="vbox">
- <checkbox name="five_steps" script="yes_only" truevalue="ja" falsevalue="nej"
+ <checkbox name="de_fem_trin" script="yes_only" truevalue="ja" falsevalue="nej"
caption="De 5 trin til forebyggelse af forveksling af øjnene er gennemgået:"/>
</frame>
<frame layout="hbox">
diff --git a/server/xml/macros/keratometri-1.0.xml b/server/xml/macros/keratometri-1.0.xml
index c762309..be01e01 100644
--- a/server/xml/macros/keratometri-1.0.xml
+++ b/server/xml/macros/keratometri-1.0.xml
@@ -14,12 +14,12 @@
out = ''
- if ( getValue('keratometri.odxt.missing') == '' )
+ if ( getValue('keratometri.mangler.odxt') == '' )
then
- rr1 = tonmb(getValue('keratometri.odxt.r1'))
- rr2 = tonmb(getValue('keratometri.odxt.r2'))
- rx1 = tonmb(getValue('keratometri.odxt.x1'))
+ rr1 = tonmb(getValue('keratometri.r.odxt1'))
+ rr2 = tonmb(getValue('keratometri.r.odxt2'))
+ rx1 = tonmb(getValue('keratometri.x.odxt1'))
if ( rx1 &gt;= 0 and rx1 &lt; 90 ) then
rx2 = rx1 + 90
@@ -53,12 +53,12 @@
end
- if ( getValue('keratometri.osin.missing') == '' )
+ if ( getValue('keratometri.mangler.osin') == '' )
then
- lr1 = tonmb(getValue('keratometri.osin.r1'))
- lr2 = tonmb(getValue('keratometri.osin.r2'))
- lx1 = tonmb(getValue('keratometri.osin.x1'))
+ lr1 = tonmb(getValue('keratometri.r.osin1'))
+ lr2 = tonmb(getValue('keratometri.r.osin2'))
+ lx1 = tonmb(getValue('keratometri.x.osin1'))
if ( lx1 &gt;= 0 and lx1 &lt; 90 ) then
lx2 = lx1 + 90
@@ -96,42 +96,42 @@
</resume>
<queries>
<query class="keratometri" 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 = 'pracro'
- 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
@@ -193,22 +193,22 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="keratometri.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="keratometri.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="R1:"/>
- <lineedit name="keratometri.odxt.r1" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt0" value=""/>
+ <lineedit name="keratometri.r.odxt1" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt0" value=""/>
</frame>
<frame layout="vbox">
<label caption="R2:"/>
- <lineedit name="keratometri.odxt.r2" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt0" value=""/>
+ <lineedit name="keratometri.r.odxt2" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt0" value=""/>
</frame>
<frame layout="vbox">
<label caption="X1 (fladeste akse):"/>
- <lineedit name="keratometri.odxt.x1" regexp="[\d]+" script="lt180gt0" value=""/>
+ <lineedit name="keratometri.x.odxt1" regexp="[\d]+" script="lt180gt0" value=""/>
</frame>
</frame>
</frame>
@@ -216,22 +216,22 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="keratometri.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="keratometri.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="R1:"/>
- <lineedit name="keratometri.osin.r1" regexp="\d{1,2},\d{2}" script="lt20gt0" value=""/>
+ <lineedit name="keratometri.r.osin1" regexp="\d{1,2},\d{2}" script="lt20gt0" value=""/>
</frame>
<frame layout="vbox">
<label caption="R2:"/>
- <lineedit name="keratometri.osin.r2" regexp="\d{1,2},\d{2}" script="lt20gt0" value=""/>
+ <lineedit name="keratometri.r.osin2" regexp="\d{1,2},\d{2}" script="lt20gt0" value=""/>
</frame>
<frame layout="vbox">
<label caption="X1 (fladeste akse):"/>
- <lineedit name="keratometri.osin.x1" regexp="[\d]+" script="lt180gt0" value=""/>
+ <lineedit name="keratometri.x.osin1" regexp="[\d]+" script="lt180gt0" value=""/>
</frame>
</frame>
</frame>
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>
diff --git a/server/xml/macros/oct_konklusion-1.0.xml b/server/xml/macros/oct_konklusion-1.0.xml
index e0a2689..d8f9bdb 100644
--- a/server/xml/macros/oct_konklusion-1.0.xml
+++ b/server/xml/macros/oct_konklusion-1.0.xml
@@ -15,18 +15,18 @@
<macro name="oct_konklusion" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('oct.odxt.missing') == '' or getValue('oct.osin.missing') == '' )
+ if ( getValue('oct.mangler.odxt') == '' or getValue('oct.mangler.osin') == '' )
then
out = out .. 'Central nethinde konklusion:\n'
- if ( getValue('oct.odxt.missing') == '' )
+ if ( getValue('oct.mangler.odxt') == '' )
then
- out = out .. 'OCT o.dxt ' .. getValue('oct.odxt.description') .. '.\n'
+ out = out .. 'OCT o.dxt ' .. getValue('oct.description.odxt') .. '.\n'
end
- if ( getValue('oct.osin.missing') == '' )
+ if ( getValue('oct.mangler.osin') == '' )
then
- out = out .. 'OCT o.sin ' .. getValue('oct.osin.description') .. '.\n'
+ out = out .. 'OCT o.sin ' .. getValue('oct.description.osin') .. '.\n'
end
end
@@ -38,46 +38,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
@@ -111,20 +111,20 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="oct.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="oct.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">
<frame layout="hbox">
<label caption="Tykkelse:"/>
- <lineedit name="oct.odxt.thickness" value="" readonly="true"/>
+ <lineedit name="oct.thickness.odxt" value="" readonly="true"/>
<label caption="µm"/>
</frame>
<label caption=""/>
</frame>
- <altcombobox name="oct.odxt.description" type="select" value="normal" layout="vbox">
+ <altcombobox name="oct.description.odxt" type="select" value="normal" layout="vbox">
<item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
<item caption="Serøs amotio" value="serøs amotio"/>
<item caption="Cystoidt makulært ødem" value="cystoidt makulært ødem"/>
@@ -142,19 +142,19 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="oct.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="oct.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">
<frame layout="hbox">
<label caption="Tykkelse:"/>
- <lineedit name="oct.osin.thickness" value="" readonly="true"/>
+ <lineedit name="oct.thickness.osin" value="" readonly="true"/>
<label caption="µm"/>
</frame>
<label caption=""/>
</frame>
- <altcombobox name="oct.osin.description" type="select" value="normal" layout="vbox">
+ <altcombobox name="oct.description.osin" type="select" value="normal" layout="vbox">
<item caption="Pigmentepitelløsning" value="pigmentepitelløsning"/>
<item caption="Serøs amotio" value="serøs amotio"/>
<item caption="Cystoidt makulært ødem" value="cystoidt makulært ødem"/>
diff --git a/server/xml/macros/oct_maaling-1.0.xml b/server/xml/macros/oct_maaling-1.0.xml
index 1339787..06871cd 100644
--- a/server/xml/macros/oct_maaling-1.0.xml
+++ b/server/xml/macros/oct_maaling-1.0.xml
@@ -14,18 +14,18 @@
<macro name="oct_maaling" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('oct.odxt.missing') == '' or getValue('oct.osin.missing') == '' )
+ if ( getValue('oct.mangler.odxt') == '' or getValue('oct.mangler.osin') == '' )
then
out = out .. 'Central nethindetykkelse:\n'
- if ( getValue('oct.odxt.missing') == '' )
+ if ( getValue('oct.mangler.odxt') == '' )
then
- out = out .. 'OCT o.dxt ' .. getValue('oct.odxt.thickness') .. ' µm\n'
+ out = out .. 'OCT o.dxt ' .. getValue('oct.thickness.odxt') .. ' µm\n'
end
- if ( getValue('oct.osin.missing') == '' )
+ if ( getValue('oct.mangler.osin') == '' )
then
- out = out .. 'OCT o.sin ' .. getValue('oct.osin.thickness') .. ' µm\n'
+ out = out .. 'OCT o.sin ' .. getValue('oct.thickness.osin') .. ' µm\n'
end
end
@@ -33,46 +33,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
@@ -115,12 +115,12 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="oct.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="oct.mangler.odxt" script="right_eye"
+ map="missing_eye_odxt_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="right_eye_frame" caption="o.dxt" layout="hbox">
<label caption="Tykkelse:"/>
- <lineedit name="oct.odxt.thickness" regexp="\d{1,5}" script="lt10000gt0" value=""/>
+ <lineedit name="oct.thickness.odxt" regexp="\d{1,5}" script="lt10000gt0" value=""/>
<label caption="µm"/>
</frame>
</frame>
@@ -128,12 +128,12 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="oct.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="oct.mangler.osin" script="left_eye"
+ map="missing_eye_osin_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="left_eye_frame" caption="o.sin" layout="hbox">
<label caption="Tykkelse:"/>
- <lineedit name="oct.osin.thickness" regexp="\d{1,5}" script="lt10000gt0" value=""/>
+ <lineedit name="oct.thickness.osin" regexp="\d{1,5}" script="lt10000gt0" value=""/>
<label caption="µm"/>
</frame>
diff --git a/server/xml/macros/oejentryk-1.0.xml b/server/xml/macros/oejentryk-1.0.xml
index f796580..fb6cca4 100644
--- a/server/xml/macros/oejentryk-1.0.xml
+++ b/server/xml/macros/oejentryk-1.0.xml
@@ -15,22 +15,22 @@
<resume language="lua">
out = ''
- if ( getValue('tonometer.odxt.missing') == '' or getValue('tonometer.osin.missing') == '' )
+ if ( getValue('tonometer.mangler.odxt') == '' or getValue('tonometer.mangler.osin') == '' )
then
out = out .. 'Øjentryk:\n'
end
- if ( getValue('tonometer.odxt.missing') == '' )
+ if ( getValue('tonometer.mangler.odxt') == '' )
then
out = out .. 'o.dxt: ' .. getValue('tonometer.pressure.odxt') .. ' mmHg\n'
end
- if ( getValue('tonometer.osin.missing') == '' )
+ if ( getValue('tonometer.mangler.osin') == '' )
then
out = out .. 'o.sin: ' .. getValue('tonometer.pressure.odxt') .. ' mmHg\n'
end
- if ( getValue('tonometer.odxt.missing') == '' or getValue('tonometer.osin.missing') == '' )
+ if ( getValue('tonometer.mangler.odxt') == '' or getValue('tonometer.mangler.osin') == '' )
then
out = out .. getValue('tonometer.device') .. '.\n'
end
@@ -38,46 +38,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
@@ -106,7 +106,7 @@
enable('right_eye_frame')
end
- if( getValue('tonometer.odxt.missing') == 'mangler' and getValue('tonometer.osin.missing') == 'mangler' )
+ if( getValue('tonometer.mangler.odxt') == 'mangler' and getValue('tonometer.mangler.osin') == 'mangler' )
then
disable('device_frame')
else
@@ -123,7 +123,7 @@
enable('left_eye_frame')
end
- if( getValue('tonometer.odxt.missing') == 'mangler' and getValue('tonometer.osin.missing') == 'mangler' )
+ if( getValue('tonometer.mangler.odxt') == 'mangler' and getValue('tonometer.mangler.osin') == 'mangler' )
then
disable('device_frame')
else
@@ -141,8 +141,8 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="tonometer.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="tonometer.mangler.odxt" script="right_eye"
+ map="missing_eye_odxt_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="right_eye_frame" caption="o.dxt" layout="hbox">
<label caption="Tryk:"/>
@@ -156,8 +156,8 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="tonometer.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="tonometer.mangler.osin" script="left_eye"
+ map="missing_eye_osin_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="left_eye_frame" caption="o.sin" layout="hbox">
<label caption="Tryk:"/>
diff --git a/server/xml/macros/pupilstoerrelse-1.0.xml b/server/xml/macros/pupilstoerrelse-1.0.xml
index b648d46..0eb7fd1 100644
--- a/server/xml/macros/pupilstoerrelse-1.0.xml
+++ b/server/xml/macros/pupilstoerrelse-1.0.xml
@@ -2,19 +2,19 @@
<macro name="pupilstoerrelse" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('pupilstoerrelse.odxt.missing') == '' or getValue('pupilstoerrelse.osin.missing') == '' )
+ if ( getValue('pupilstoerrelse.mangler.odxt') == '' or getValue('pupilstoerrelse.mangler.osin') == '' )
then
out = out .. 'Pupilstørrelse, ' .. getValue('pupilstoerrelse.method') .. ':\n'
end
- if ( getValue('pupilstoerrelse.odxt.missing') == '' )
+ if ( getValue('pupilstoerrelse.mangler.odxt') == '' )
then
- out = out .. 'o.dxt: ' .. getValue('pupilstoerrelse.odxt.diameter') .. ' mm\n'
+ out = out .. 'o.dxt: ' .. getValue('pupilstoerrelse.diameter.odxt') .. ' mm\n'
end
- if ( getValue('pupilstoerrelse.osin.missing') == '' )
+ if ( getValue('pupilstoerrelse.mangler.osin') == '' )
then
- out = out .. 'o.sin: ' .. getValue('pupilstoerrelse.osin.diameter') .. ' mm\n'
+ out = out .. 'o.sin: ' .. getValue('pupilstoerrelse.diameter.osin') .. ' mm\n'
end
return out
@@ -22,42 +22,42 @@
<queries>
</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
@@ -105,14 +105,14 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="pupilstoerrelse.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="pupilstoerrelse.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="Diameter:"/>
<frame layout="hbox">
- <lineedit name="pupilstoerrelse.odxt.diameter" script="lt12gt0"
+ <lineedit name="pupilstoerrelse.diameter.odxt" script="lt12gt0"
regexp="\d{1,2},\d{1}" value=""/>
<label caption="mm"/>
</frame>
@@ -123,14 +123,14 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="pupilstoerrelse.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="pupilstoerrelse.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="Diameter:"/>
<frame layout="hbox">
- <lineedit name="pupilstoerrelse.osin.diameter" script="lt12gt0"
+ <lineedit name="pupilstoerrelse.diameter.osin" script="lt12gt0"
regexp="\d{1,2},\d{1}" value=""/>
<label caption="mm"/>
</frame>
diff --git a/server/xml/macros/ref-spaltelampe-1.0.xml b/server/xml/macros/ref-spaltelampe-1.0.xml
index c216237..95866fe 100644
--- a/server/xml/macros/ref-spaltelampe-1.0.xml
+++ b/server/xml/macros/ref-spaltelampe-1.0.xml
@@ -2,245 +2,245 @@
<macro name="ref.spaltelampe" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('spaltelampe.odxt.missing') == '' )
+ if ( getValue('spaltelampe.mangler.odxt') == '' )
then
out = out .. 'Spaltelampe, o.dxt:\n'
- if ( getValue('spaltelampe.odxt.konjuktiva') ~= '' )
+ if ( getValue('spaltelampe.konjuktiva.odxt') ~= '' )
then
- out = out .. 'Konjuktiva: ' .. getValue('spaltelampe.odxt.konjuktiva') .. '\n'
+ out = out .. 'Konjuktiva: ' .. getValue('spaltelampe.konjuktiva.odxt') .. '\n'
end
out = out .. 'Cornea:\n'
- if ( getValue('spaltelampe.odxt.epitel.intakt') ~= '' or getValue('spaltelampe.odxt.epitel.central_epiteldefekt') ~= '' or getValue('spaltelampe.odxt.epitel.toerhedsforandringer') ~= '' or getValue('spaltelampe.odxt.epitel.andet') ~= '')
+ if ( getValue('spaltelampe.epitel.intakt.odxt') ~= '' or getValue('spaltelampe.epitel.central_epiteldefekt.odxt') ~= '' or getValue('spaltelampe.epitel.toerhedsforandringer.odxt') ~= '' or getValue('spaltelampe.epitel.andet.odxt') ~= '')
then
out = out .. ' Epitel: '
end
- if ( getValue('spaltelampe.odxt.epitel.intakt') ~= '' )
+ if ( getValue('spaltelampe.epitel.intakt.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.epitel.intakt')
- if ( getValue('spaltelampe.odxt.epitel.central_epiteldefekt') ~= '' or getValue('spaltelampe.odxt.epitel.toerhedsforandringer') ~= '' or getValue('spaltelampe.odxt.epitel.andet') ~= '')
+ out = out .. getValue('spaltelampe.epitel.intakt.odxt')
+ if ( getValue('spaltelampe.epitel.central_epiteldefekt.odxt') ~= '' or getValue('spaltelampe.epitel.toerhedsforandringer.odxt') ~= '' or getValue('spaltelampe.epitel.andet.odxt') ~= '')
then
out = out .. ', '
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.odxt.epitel.central_epiteldefekt') ~= '' )
+ if ( getValue('spaltelampe.epitel.central_epiteldefekt.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.epitel.central_epiteldefekt')
- if (getValue('spaltelampe.odxt.epitel.toerhedsforandringer') ~= '' or getValue('spaltelampe.odxt.epitel.andet') ~= '')
+ out = out .. getValue('spaltelampe.epitel.central_epiteldefekt.odxt')
+ if (getValue('spaltelampe.epitel.toerhedsforandringer.odxt') ~= '' or getValue('spaltelampe.epitel.andet.odxt') ~= '')
then
out = out .. ', '
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.odxt.epitel.toerhedsforandringer') ~= '' )
+ if ( getValue('spaltelampe.epitel.toerhedsforandringer.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.epitel.toerhedsforandringer')
- if (getValue('spaltelampe.odxt.epitel.andet') ~= '')
+ out = out .. getValue('spaltelampe.epitel.toerhedsforandringer.odxt')
+ if (getValue('spaltelampe.epitel.andet.odxt') ~= '')
then
out = out .. ', '
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.odxt.epitel.andet') ~= '' )
+ if ( getValue('spaltelampe.epitel.andet.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.epitel.andet') .. '\n'
+ out = out .. getValue('spaltelampe.epitel.andet.odxt') .. '\n'
end
- if ( getValue('spaltelampe.odxt.stroma') ~= '' )
+ if ( getValue('spaltelampe.stroma.odxt') ~= '' )
then
- out = out .. ' Stroma: ' .. getValue('spaltelampe.odxt.stroma') .. '\n'
+ out = out .. ' Stroma: ' .. getValue('spaltelampe.stroma.odxt') .. '\n'
end
- if ( getValue('spaltelampe.odxt.flap') ~= '' )
+ if ( getValue('spaltelampe.flap.odxt') ~= '' )
then
- out = out .. ' Flap: ' .. getValue('spaltelampe.odxt.flap') .. '\n'
+ out = out .. ' Flap: ' .. getValue('spaltelampe.flap.odxt') .. '\n'
end
- if ( getValue('spaltelampe.odxt.folder') ~= '' )
+ if ( getValue('spaltelampe.folder.odxt') ~= '' )
then
- out = out .. ' Folder: ' .. getValue('spaltelampe.odxt.folder') .. '\n'
+ out = out .. ' Folder: ' .. getValue('spaltelampe.folder.odxt') .. '\n'
end
- if ( getValue('spaltelampe.odxt.interface.partikler') ~= '' or getValue('spaltelampe.odxt.interface.epitelindvaekst') ~= '' )
+ if ( getValue('spaltelampe.interface.partikler.odxt') ~= '' or getValue('spaltelampe.interface.epitelindvaekst.odxt') ~= '' )
then
out = out .. ' Interface: '
- if ( getValue('spaltelampe.odxt.interface.partikler') ~= '' )
+ if ( getValue('spaltelampe.interface.partikler.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.interface.partikler')
- if ( getValue('spaltelampe.odxt.interface.epitelindvaekst') ~= '' )
+ out = out .. getValue('spaltelampe.interface.partikler.odxt')
+ if ( getValue('spaltelampe.interface.epitelindvaekst.odxt') ~= '' )
then
out = out .. ', '
end
end
- if ( getValue('spaltelampe.odxt.interface.epitelindvaekst') ~= '' )
+ if ( getValue('spaltelampe.interface.epitelindvaekst.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.interface.epitelindvaekst') .. '\n'
+ out = out .. getValue('spaltelampe.interface.epitelindvaekst.odxt') .. '\n'
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.odxt.endothel') ~= '' )
+ if ( getValue('spaltelampe.endothel.odxt') ~= '' )
then
- out = out .. ' Endothel: ' .. getValue('spaltelampe.odxt.endothel') .. '\n'
+ out = out .. ' Endothel: ' .. getValue('spaltelampe.endothel.odxt') .. '\n'
end
- if ( getValue('spaltelampe.odxt.lens') ~= '' )
+ if ( getValue('spaltelampe.lens.odxt') ~= '' )
then
- out = out .. 'Lens: ' .. getValue('spaltelampe.odxt.lens') .. '\n'
+ out = out .. 'Lens: ' .. getValue('spaltelampe.lens.odxt') .. '\n'
end
- if ( getValue('spaltelampe.odxt.supplerende') ~= '' )
+ if ( getValue('spaltelampe.supplerende.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.supplerende') .. '\n'
+ out = out .. getValue('spaltelampe.supplerende.odxt') .. '\n'
end
end
- if ( getValue('spaltelampe.osin.missing') == '' )
+ if ( getValue('spaltelampe.mangler.osin') == '' )
then
- if ( getValue('spaltelampe.odxt.missing') == '' )
+ if ( getValue('spaltelampe.mangler.odxt') == '' )
then
out = out .. '\n'
end
out = out .. 'Spaltelampe, o.sin:\n'
- if ( getValue('spaltelampe.osin.konjuktiva') ~= '' )
+ if ( getValue('spaltelampe.konjuktiva.osin') ~= '' )
then
- out = out .. 'Konjuktiva: ' .. getValue('spaltelampe.osin.konjuktiva') .. '\n'
+ out = out .. 'Konjuktiva: ' .. getValue('spaltelampe.konjuktiva.osin') .. '\n'
end
out = out .. 'Cornea:\n'
- if ( getValue('spaltelampe.osin.epitel.intakt') ~= '' or getValue('spaltelampe.osin.epitel.central_epiteldefekt') ~= '' or getValue('spaltelampe.osin.epitel.toerhedsforandringer') ~= '' or getValue('spaltelampe.osin.epitel.andet') ~= '')
+ if ( getValue('spaltelampe.epitel.intakt.osin') ~= '' or getValue('spaltelampe.epitel.central_epiteldefekt.osin') ~= '' or getValue('spaltelampe.epitel.toerhedsforandringer.osin') ~= '' or getValue('spaltelampe.epitel.andet.osin') ~= '')
then
out = out .. ' Epitel: '
end
- if ( getValue('spaltelampe.osin.epitel.intakt') ~= '' )
+ if ( getValue('spaltelampe.epitel.intakt.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.epitel.intakt')
- if ( getValue('spaltelampe.osin.epitel.central_epiteldefekt') ~= '' or getValue('spaltelampe.osin.epitel.toerhedsforandringer') ~= '' or getValue('spaltelampe.osin.epitel.andet') ~= '')
+ out = out .. getValue('spaltelampe.epitel.intakt.osin')
+ if ( getValue('spaltelampe.epitel.central_epiteldefekt.osin') ~= '' or getValue('spaltelampe.epitel.toerhedsforandringer.osin') ~= '' or getValue('spaltelampe.epitel.andet.osin') ~= '')
then
out = out .. ', '
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.osin.epitel.central_epiteldefekt') ~= '' )
+ if ( getValue('spaltelampe.epitel.central_epiteldefekt.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.epitel.central_epiteldefekt')
- if (getValue('spaltelampe.osin.epitel.toerhedsforandringer') ~= '' or getValue('spaltelampe.osin.epitel.andet') ~= '')
+ out = out .. getValue('spaltelampe.epitel.central_epiteldefekt.osin')
+ if (getValue('spaltelampe.epitel.toerhedsforandringer.osin') ~= '' or getValue('spaltelampe.epitel.andet.osin') ~= '')
then
out = out .. ', '
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.osin.epitel.toerhedsforandringer') ~= '' )
+ if ( getValue('spaltelampe.epitel.toerhedsforandringer.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.epitel.toerhedsforandringer')
- if (getValue('spaltelampe.osin.epitel.andet') ~= '')
+ out = out .. getValue('spaltelampe.epitel.toerhedsforandringer.osin')
+ if (getValue('spaltelampe.epitel.andet.osin') ~= '')
then
out = out .. ', '
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.osin.epitel.andet') ~= '' )
+ if ( getValue('spaltelampe.epitel.andet.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.epitel.andet') .. '\n'
+ out = out .. getValue('spaltelampe.epitel.andet.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.epitel') ~= '' )
+ if ( getValue('spaltelampe.epitel.osin') ~= '' )
then
- out = out .. ' Epitel: ' .. getValue('spaltelampe.osin.epitel') .. '\n'
+ out = out .. ' Epitel: ' .. getValue('spaltelampe.epitel.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.stroma') ~= '' )
+ if ( getValue('spaltelampe.stroma.osin') ~= '' )
then
- out = out .. ' Stroma: ' .. getValue('spaltelampe.osin.stroma') .. '\n'
+ out = out .. ' Stroma: ' .. getValue('spaltelampe.stroma.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.flap') ~= '' )
+ if ( getValue('spaltelampe.flap.osin') ~= '' )
then
- out = out .. ' Flap: ' .. getValue('spaltelampe.osin.flap') .. '\n'
+ out = out .. ' Flap: ' .. getValue('spaltelampe.flap.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.folder') ~= '' )
+ if ( getValue('spaltelampe.folder.osin') ~= '' )
then
- out = out .. ' Folder: ' .. getValue('spaltelampe.osin.folder') .. '\n'
+ out = out .. ' Folder: ' .. getValue('spaltelampe.folder.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.interface.partikler') ~= '' or getValue('spaltelampe.osin.interface.epitelindvaekst') ~= '' )
+ if ( getValue('spaltelampe.interface.partikler.osin') ~= '' or getValue('spaltelampe.interface.epitelindvaekst.osin') ~= '' )
then
out = out .. ' Interface: '
- if ( getValue('spaltelampe.osin.interface.partikler') ~= '' )
+ if ( getValue('spaltelampe.interface.partikler.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.interface.partikler')
- if ( getValue('spaltelampe.osin.interface.epitelindvaekst') ~= '' )
+ out = out .. getValue('spaltelampe.interface.partikler.osin')
+ if ( getValue('spaltelampe.interface.epitelindvaekst.osin') ~= '' )
then
out = out .. ', '
end
end
- if ( getValue('spaltelampe.osin.interface.epitelindvaekst') ~= '' )
+ if ( getValue('spaltelampe.interface.epitelindvaekst.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.interface.epitelindvaekst') .. '\n'
+ out = out .. getValue('spaltelampe.interface.epitelindvaekst.osin') .. '\n'
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.osin.endothel') ~= '' )
+ if ( getValue('spaltelampe.endothel.osin') ~= '' )
then
- out = out .. ' Endothel: ' .. getValue('spaltelampe.osin.endothel') .. '\n'
+ out = out .. ' Endothel: ' .. getValue('spaltelampe.endothel.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.lens') ~= '' )
+ if ( getValue('spaltelampe.lens.osin') ~= '' )
then
- out = out .. 'Lens: ' .. getValue('spaltelampe.osin.lens') .. '\n'
+ out = out .. 'Lens: ' .. getValue('spaltelampe.lens.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.supplerende') ~= '' )
+ if ( getValue('spaltelampe.supplerende.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.supplerende') .. '\n'
+ out = out .. getValue('spaltelampe.supplerende.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
@@ -274,8 +274,8 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="spaltelampe.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="spaltelampe.mangler.odxt" script="right_eye"
+ map="missing_eye_odxt_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="right_eye_frame" caption="o.dxt" layout="vbox">
@@ -285,13 +285,13 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.konjuktiva" layout="vbox" value="Bleg">
+ <altcombobox name="spaltelampe.konjuktiva.odxt" layout="vbox" value="Bleg">
<item caption="Ikke udfyldt" value=""/>
<item caption="Bleg" value="Bleg"/>
<item caption="Injiceret" value="Injiceret"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.konjuktiva.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.konjuktiva.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.konjuktiva.andet"/>
+ <lineedit name="spaltelampe.konjuktiva.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -308,12 +308,12 @@
<label/>
</frame>
<frame layout="vbox">
- <checkbox name="spaltelampe.odxt.epitel.intakt" caption="Intakt" falsevalue="" truevalue="Intakt"/>
- <checkbox name="spaltelampe.odxt.epitel.central_epiteldefekt" caption="Central epiteldefekt" falsevalue="" truevalue="Central epiteldefekt"/>
- <checkbox name="spaltelampe.odxt.epitel.toerhedsforandringer" caption="Tørhedsforandringer" falsevalue="" truevalue="Tørhedsforandringer"/>
+ <checkbox name="spaltelampe.epitel.intakt.odxt" caption="Intakt" falsevalue="" truevalue="Intakt"/>
+ <checkbox name="spaltelampe.epitel.central_epiteldefekt.odxt" caption="Central epiteldefekt" falsevalue="" truevalue="Central epiteldefekt"/>
+ <checkbox name="spaltelampe.epitel.toerhedsforandringer.odxt" caption="Tørhedsforandringer" falsevalue="" truevalue="Tørhedsforandringer"/>
<frame layout="hbox">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.epitel.andet"/>
+ <lineedit name="spaltelampe.epitel.andet.odxt"/>
</frame>
</frame>
</frame>
@@ -323,7 +323,7 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.stroma" layout="vbox" value="Klart">
+ <altcombobox name="spaltelampe.stroma.odxt" layout="vbox" value="Klart">
<item caption="Ikke udfyldt" value=""/>
<item caption="Klart" value="Klart"/>
<item caption="Karindvækst" value="Karindvækst"/>
@@ -334,9 +334,9 @@
<item caption="Nogen haze - grad 2" value="Nogen haze - grad 2"/>
<item caption="Udtalt haze - grad 3" value="Udtalt haze - grad 3"/>
<item caption="Massiv haze - grad 4" value="Massiv haze - grad 4"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.stroma.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.stroma.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.stroma.andet"/>
+ <lineedit name="spaltelampe.stroma.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -348,13 +348,13 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.flap" layout="vbox" value="">
+ <altcombobox name="spaltelampe.flap.odxt" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Velplaceret" value="Velplaceret"/>
<item caption="Dislokeret" value="Dislokeret"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.flap.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.flap.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.flap.andet"/>
+ <lineedit name="spaltelampe.flap.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -366,15 +366,15 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.folder" layout="vbox" value="">
+ <altcombobox name="spaltelampe.folder.odxt" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Ingen" value="Ingen"/>
<item caption="Mikrofolder" value="Mikrofolder"/>
<item caption="Lette folder" value="Lette folder"/>
<item caption="Udtalte folder" value="Udtalte folder"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.folder.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.folder.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.folder.andet"/>
+ <lineedit name="spaltelampe.folder.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -388,26 +388,26 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.interface.partikler" layout="vbox" value="">
+ <altcombobox name="spaltelampe.interface.partikler.odxt" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Ingen partikler eller debris" value="Ingen partikler eller debris"/>
<item caption="Enkelte partikler" value="Enkelte partikler"/>
<item caption="Nogen partikler" value="Nogen partikler"/>
<item caption="Udtalte partikler" value="Udtalte partikler"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.interface.partikler.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.interface.partikler.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.interface.partikler.andet"/>
+ <lineedit name="spaltelampe.interface.partikler.andet.odxt"/>
</altitem>
</altcombobox>
- <altcombobox name="spaltelampe.odxt.interface.epitelindvaekst" layout="vbox" value="">
+ <altcombobox name="spaltelampe.interface.epitelindvaekst.odxt" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Ingen epitelindvækst" value="Ingen epitelindvækst"/>
<item caption="Diskret epitelindvækst" value="Diskret epitelindvækst"/>
<item caption="Let epitelindvækst" value="Let epitelindvækst"/>
<item caption="Betydende epitelindvækst" value="Betydende epitelindvækst"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.interface.epitelindvaekst.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.interface.epitelindvaekst.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.interface.epitelindvaekst.andet"/>
+ <lineedit name="spaltelampe.interface.epitelindvaekst.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -419,12 +419,12 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.endothel" layout="vbox" value="Upåfaldende">
+ <altcombobox name="spaltelampe.endothel.odxt" layout="vbox" value="Upåfaldende">
<item caption="Upåfaldende" value="Upåfaldende"/>
<item caption="Guttatae" value="Guttatae"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.endothel.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.endothel.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.endothel.andet"/>
+ <lineedit name="spaltelampe.endothel.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -438,16 +438,16 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.lens" layout="vbox" value="Klar">
+ <altcombobox name="spaltelampe.lens.odxt" layout="vbox" value="Klar">
<item caption="Klar" value="Klar"/>
<item caption="Katarakt-1" value="Katarakt-1"/>
<item caption="Katarakt-2" value="Katarakt-2"/>
<item caption="Katarakt-3" value="Katarakt-3"/>
<item caption="Katarakt-4" value="Katarakt-4"/>
<item caption="Pseudofak" value="Pseudofak"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.lens.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.lens.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.lens.andet"/>
+ <lineedit name="spaltelampe.lens.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -455,7 +455,7 @@
<frame layout="vbox">
<label caption="Supplerende:"/>
- <lineedit name="spaltelampe.odxt.supplerende"/>
+ <lineedit name="spaltelampe.supplerende.odxt"/>
</frame>
</frame>
@@ -464,8 +464,8 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="spaltelampe.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="spaltelampe.mangler.osin" script="left_eye"
+ map="missing_eye_osin_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="left_eye_frame" caption="o.sin" layout="vbox">
@@ -475,13 +475,13 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.konjuktiva" layout="vbox" value="Bleg">
+ <altcombobox name="spaltelampe.konjuktiva.osin" layout="vbox" value="Bleg">
<item caption="Ikke udfyldt" value=""/>
<item caption="Bleg" value="Bleg"/>
<item caption="Injiceret" value="Injiceret"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.konjuktiva.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.konjuktiva.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.konjuktiva.andet"/>
+ <lineedit name="spaltelampe.konjuktiva.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -498,12 +498,12 @@
<label/>
</frame>
<frame layout="vbox">
- <checkbox name="spaltelampe.osin.epitel.intakt" caption="Intakt" falsevalue="" truevalue="Intakt"/>
- <checkbox name="spaltelampe.osin.epitel.central_epiteldefekt" caption="Central epiteldefekt" falsevalue="" truevalue="Central epiteldefekt"/>
- <checkbox name="spaltelampe.osin.epitel.toerhedsforandringer" caption="Tørhedsforandringer" falsevalue="" truevalue="Tørhedsforandringer"/>
+ <checkbox name="spaltelampe.epitel.intakt.osin" caption="Intakt" falsevalue="" truevalue="Intakt"/>
+ <checkbox name="spaltelampe.epitel.central_epiteldefekt.osin" caption="Central epiteldefekt" falsevalue="" truevalue="Central epiteldefekt"/>
+ <checkbox name="spaltelampe.epitel.toerhedsforandringer.osin" caption="Tørhedsforandringer" falsevalue="" truevalue="Tørhedsforandringer"/>
<frame layout="hbox">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.epitel.andet"/>
+ <lineedit name="spaltelampe.epitel.andet.osin"/>
</frame>
</frame>
</frame>
@@ -513,7 +513,7 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.stroma" layout="vbox" value="Klart">
+ <altcombobox name="spaltelampe.stroma.osin" layout="vbox" value="Klart">
<item caption="Ikke udfyldt" value=""/>
<item caption="Klart" value="Klart"/>
<item caption="Karindvækst" value="Karindvækst"/>
@@ -524,9 +524,9 @@
<item caption="Nogen haze - grad 2" value="Nogen haze - grad 2"/>
<item caption="Udtalt haze - grad 3" value="Udtalt haze - grad 3"/>
<item caption="Massiv haze - grad 4" value="Massiv haze - grad 4"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.stroma.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.stroma.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.stroma.andet"/>
+ <lineedit name="spaltelampe.stroma.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -538,13 +538,13 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.flap" layout="vbox" value="">
+ <altcombobox name="spaltelampe.flap.osin" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Velplaceret" value="Velplaceret"/>
<item caption="Dislokeret" value="Dislokeret"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.flap.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.flap.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.flap.andet"/>
+ <lineedit name="spaltelampe.flap.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -556,15 +556,15 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.folder" layout="vbox" value="">
+ <altcombobox name="spaltelampe.folder.osin" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Ingen" value="Ingen"/>
<item caption="Mikrofolder" value="Mikrofolder"/>
<item caption="Lette folder" value="Lette folder"/>
<item caption="Udtalte folder" value="Udtalte folder"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.folder.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.folder.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.folder.andet"/>
+ <lineedit name="spaltelampe.folder.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -578,26 +578,26 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.partikler" layout="vbox" value="">
+ <altcombobox name="spaltelampe.partikler.osin" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Ingen partikler eller debris" value="Ingen partikler eller debris"/>
<item caption="Enkelte partikler" value="Enkelte partikler"/>
<item caption="Nogen partikler" value="Nogen partikler"/>
<item caption="Udtalte partikler" value="Udtalte partikler"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.partikler.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.partikler.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.partikler.andet"/>
+ <lineedit name="spaltelampe.partikler.andet.osin"/>
</altitem>
</altcombobox>
- <altcombobox name="spaltelampe.osin.epitelindvaekst" layout="vbox" value="">
+ <altcombobox name="spaltelampe.epitelindvaekst.osin" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Ingen epitelindvækst" value="Ingen epitelindvækst"/>
<item caption="Diskret epitelindvækst" value="Diskret epitelindvækst"/>
<item caption="Let epitelindvækst" value="Let epitelindvækst"/>
<item caption="Betydende epitelindvækst" value="Betydende epitelindvækst"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.epitelindvaekst.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.epitelindvaekst.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.epitelindvaekst.andet"/>
+ <lineedit name="spaltelampe.epitelindvaekst.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -609,12 +609,12 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.endothel" layout="vbox" value="Upåfaldende">
+ <altcombobox name="spaltelampe.endothel.osin" layout="vbox" value="Upåfaldende">
<item caption="Upåfaldende" value="Upåfaldende"/>
<item caption="Guttatae" value="Guttatae"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.endothel.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.endothel.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.endothel.andet"/>
+ <lineedit name="spaltelampe.endothel.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -628,16 +628,16 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.lens" layout="vbox" value="Klar">
+ <altcombobox name="spaltelampe.lens.osin" layout="vbox" value="Klar">
<item caption="Klar" value="Klar"/>
<item caption="Katarakt-1" value="Katarakt-1"/>
<item caption="Katarakt-2" value="Katarakt-2"/>
<item caption="Katarakt-3" value="Katarakt-3"/>
<item caption="Katarakt-4" value="Katarakt-4"/>
<item caption="Pseudofak" value="Pseudofak"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.lens.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.lens.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.lens.andet"/>
+ <lineedit name="spaltelampe.lens.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -645,7 +645,7 @@
<frame layout="vbox">
<label caption="Supplerende:"/>
- <lineedit name="spaltelampe.osin.supplerende"/>
+ <lineedit name="spaltelampe.supplerende.osin"/>
</frame>
</frame>
diff --git a/server/xml/macros/ref_90d_linse-1.0.xml b/server/xml/macros/ref_90d_linse-1.0.xml
index a344db3..43576e3 100644
--- a/server/xml/macros/ref_90d_linse-1.0.xml
+++ b/server/xml/macros/ref_90d_linse-1.0.xml
@@ -2,89 +2,89 @@
<macro name="ref_90d_linse" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('90d_linse.odxt.missing') == '' )
+ if ( getValue('90d_linse.mangler.odxt') == '' )
then
out = out .. 'Oftalmoskopi, o.dxt:\n'
- out = out .. getValue('90d_linse.odxt.indblik') .. ' indblik.\n'
- out = out .. 'Papil: ' .. getValue('90d_linse.odxt.papil') .. '\n'
- out = out .. 'Makula: ' .. getValue('90d_linse.odxt.makula') .. '\n'
- out = out .. 'Periferi: ' .. getValue('90d_linse.odxt.periferi')
- if ( getValue('90d_linse.odxt.periferi') == 'Hul eller rift kl' )
+ out = out .. getValue('90d_linse.indblik.odxt') .. ' indblik.\n'
+ out = out .. 'Papil: ' .. getValue('90d_linse.papil.odxt') .. '\n'
+ out = out .. 'Makula: ' .. getValue('90d_linse.makula.odxt') .. '\n'
+ out = out .. 'Periferi: ' .. getValue('90d_linse.periferi.odxt')
+ if ( getValue('90d_linse.periferi.odxt') == 'Hul eller rift kl' )
then
- out = out .. ' ' .. getValue('90dlinse.odxt.hul_eller_rift_kl') .. '\n'
+ out = out .. ' ' .. getValue('90dlinse.hul_eller_rift_kl.odxt') .. '\n'
else
out = out .. '\n'
end
- if ( getValue('90d_linse.odxt.supplerende') ~= '' )
+ if ( getValue('90d_linse.supplerende.odxt') ~= '' )
then
- out = out .. getValue('90d_linse.odxt.supplerende') .. '\n'
+ out = out .. getValue('90d_linse.supplerende.odxt') .. '\n'
end
end
- if ( getValue('90d_linse.osin.missing') == '' )
+ if ( getValue('90d_linse.mangler.osin') == '' )
then
- if ( getValue('90d_linse.odxt.missing') == '' )
+ if ( getValue('90d_linse.mangler.odxt') == '' )
then
out = out .. '\n'
end
out = out .. 'Oftalmoskopi, o.sin:\n'
- out = out .. getValue('90d_linse.osin.indblik') .. ' indblik.\n'
- out = out .. 'Papil: ' .. getValue('90d_linse.osin.papil') .. '\n'
- out = out .. 'Makula: ' .. getValue('90d_linse.osin.makula') .. '\n'
- out = out .. 'Periferi: ' .. getValue('90d_linse.osin.periferi')
- if ( getValue('90d_linse.osin.periferi') == 'Hul eller rift kl' )
+ out = out .. getValue('90d_linse.indblik.osin') .. ' indblik.\n'
+ out = out .. 'Papil: ' .. getValue('90d_linse.papil.osin') .. '\n'
+ out = out .. 'Makula: ' .. getValue('90d_linse.makula.osin') .. '\n'
+ out = out .. 'Periferi: ' .. getValue('90d_linse.periferi.osin')
+ if ( getValue('90d_linse.periferi.osin') == 'Hul eller rift kl' )
then
- out = out .. ' ' .. getValue('90dlinse.osin.hul_eller_rift_kl') .. '\n'
+ out = out .. ' ' .. getValue('90dlinse.hul_eller_rift_kl.osin') .. '\n'
else
out = out .. '\n'
end
- if ( getValue('90d_linse.osin.supplerende') ~= '' )
+ if ( getValue('90d_linse.supplerende.osin') ~= '' )
then
- out = out .. getValue('90d_linse.osin.supplerende') .. '\n'
+ out = out .. getValue('90d_linse.supplerende.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
@@ -109,21 +109,21 @@
end
return true
</script>
- <script language="lua" name="hul_eller_rift_right">
- if ( getValue('90d_linse.odxt.periferi') == 'Hul eller rift kl' )
+ <script language="lua" name="hul_eller_rift_odxt">
+ if ( getValue('90d_linse.periferi.odxt') == 'Hul eller rift kl' )
then
- enable('hul_eller_rift.odxt.frame')
+ enable('hul_eller_rift.frame.odxt')
else
- disable('hul_eller_rift.odxt.frame')
+ disable('hul_eller_rift.frame.odxt')
end
return true
</script>
- <script language="lua" name="hul_eller_rift_left">
- if ( getValue('90d_linse.osin.periferi') == 'Hul eller rift kl' )
+ <script language="lua" name="hul_eller_rift_osin">
+ if ( getValue('90d_linse.periferi.osin') == 'Hul eller rift kl' )
then
- enable('hul_eller_rift.osin.frame')
+ enable('hul_eller_rift.frame.osin')
else
- disable('hul_eller_rift.osin.frame')
+ disable('hul_eller_rift.frame.osin')
end
return true
</script>
@@ -136,8 +136,8 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="90d_linse.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="90d_linse.mangler.odxt" script="right_eye"
+ map="missing_eye_odxt_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="right_eye_frame" caption="o.dxt" layout="vbox">
@@ -147,13 +147,13 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="90d_linse.odxt.indblik" layout="vbox" value="Klart">
+ <altcombobox name="90d_linse.indblik.odxt" layout="vbox" value="Klart">
<item caption="Klart" value="Klart"/>
<item caption="Let sløret" value="Let sløret"/>
<item caption="Meget sløret" value="Meget sløret"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.odxt.indblik.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.indblik.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="90d_linse.odxt.indblik.andet"/>
+ <lineedit name="90d_linse.indblik.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -165,15 +165,15 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="90d_linse.odxt.papil" layout="vbox" value="Normal, ikke ekskaveret">
+ <altcombobox name="90d_linse.papil.odxt" layout="vbox" value="Normal, ikke ekskaveret">
<item caption="Myop" value="Myop"/>
<item caption="Normal, ikke ekskaveret" value="Normal, ikke ekskaveret"/>
<item caption="Koncentrisk ekskavation" value="Koncentrisk ekskavation"/>
<item caption="Glaukomsuspekt" value="Glaukomsuspekt"/>
<item caption="Glaukomatøs ekskavation" value="Glaukomatøs ekskavation"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.odxt.papil.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.papil.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="90d_linse.odxt.papil.andet"/>
+ <lineedit name="90d_linse.papil.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -184,14 +184,14 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="90d_linse.odxt.makula" layout="vbox" value="Normal">
+ <altcombobox name="90d_linse.makula.odxt" layout="vbox" value="Normal">
<item caption="Normal" value="Normal"/>
<item caption="Atrofiske forandringer" value="Atrofiske forandringer"/>
<item caption="Diabetiske non-proliferative forandringer" value="Diabetiske non-proliferative forandringer"/>
<item caption="Diabetiske proliferative forandringer" value="Diabetiske proliferative forandringer"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.odxt.makula.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.makula.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="90d_linse.odxt.makula.andet"/>
+ <lineedit name="90d_linse.makula.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -203,19 +203,19 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="90d_linse.odxt.periferi" layout="vbox" value="Ingen degenerative forandringer" script="hul_eller_rift_right">
+ <altcombobox name="90d_linse.periferi.odxt" layout="vbox" value="Ingen degenerative forandringer" script="hul_eller_rift_odxt">
<item caption="Ingen degenerative forandringer" value="Ingen degenerative forandringer"/>
<item caption="Perifere degenerationer" value="Perifere degenerationer"/>
<item caption="Lattice" value="Lattice"/>
<item caption="Hul eller rift kl (anfør herunder)" value="Hul eller rift kl"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.odxt.periferi.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.periferi.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="90d_linse.odxt.periferi.andet"/>
+ <lineedit name="90d_linse.periferi.andet.odxt"/>
</altitem>
</altcombobox>
- <frame name="hul_eller_rift.odxt.frame" layout="hbox">
+ <frame name="hul_eller_rift.frame.odxt" layout="hbox">
<label caption="Hul eller rift kl.:"/>
- <combobox name="90dlinse.odxt.hul_eller_rift_kl">
+ <combobox name="90dlinse.hul_eller_rift_kl.odxt">
<item caption="1" value="1"/>
<item caption="2" value="2"/>
<item caption="3" value="3"/>
@@ -235,7 +235,7 @@
</frame>
<label caption="Supplerende:"/>
- <lineedit name="90d_linse.odxt.supplerende"/>
+ <lineedit name="90d_linse.supplerende.odxt"/>
</frame>
</frame>
@@ -243,8 +243,8 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="90d_linse.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="90d_linse.mangler.osin" script="left_eye"
+ map="missing_eye_osin_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="left_eye_frame" caption="o.dxt" layout="vbox">
@@ -254,13 +254,13 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="90d_linse.osin.indblik" layout="vbox" value="Klart">
+ <altcombobox name="90d_linse.indblik.osin" layout="vbox" value="Klart">
<item caption="Klart" value="Klart"/>
<item caption="Let sløret" value="Let sløret"/>
<item caption="Meget sløret" value="Meget sløret"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.osin.indblik.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.indblik.andet.osin">
<label caption="Andet:"/>
- <lineedit name="90d_linse.osin.indblik.andet"/>
+ <lineedit name="90d_linse.indblik.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -272,15 +272,15 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="90d_linse.osin.papil" layout="vbox" value="Normal, ikke ekskaveret">
+ <altcombobox name="90d_linse.papil.osin" layout="vbox" value="Normal, ikke ekskaveret">
<item caption="Myop" value="Myop"/>
<item caption="Normal, ikke ekskaveret" value="Normal, ikke ekskaveret"/>
<item caption="Koncentrisk ekskavation" value="Koncentrisk ekskavation"/>
<item caption="Glaukomsuspekt" value="Glaukomsuspekt"/>
<item caption="Glaukomatøs ekskavation" value="Glaukomatøs ekskavation"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.osin.papil.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.papil.andet.osin">
<label caption="Andet:"/>
- <lineedit name="90d_linse.osin.papil.andet"/>
+ <lineedit name="90d_linse.papil.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -291,14 +291,14 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="90d_linse.osin.makula" layout="vbox" value="Normal">
+ <altcombobox name="90d_linse.makula.osin" layout="vbox" value="Normal">
<item caption="Normal" value="Normal"/>
<item caption="Atrofiske forandringer" value="Atrofiske forandringer"/>
<item caption="Diabetiske non-proliferative forandringer" value="Diabetiske non-proliferative forandringer"/>
<item caption="Diabetiske proliferative forandringer" value="Diabetiske proliferative forandringer"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.osin.makula.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.makula.andet.osin">
<label caption="Andet:"/>
- <lineedit name="90d_linse.osin.makula.andet"/>
+ <lineedit name="90d_linse.makula.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -310,19 +310,19 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="90d_linse.osin.periferi" layout="vbox" value="Ingen degenerative forandringer" script="hul_eller_rift_left">
+ <altcombobox name="90d_linse.periferi.osin" layout="vbox" value="Ingen degenerative forandringer" script="hul_eller_rift_osin">
<item caption="Ingen degenerative forandringer" value="Ingen degenerative forandringer"/>
<item caption="Perifere degenerationer" value="Perifere degenerationer"/>
<item caption="Lattice" value="Lattice"/>
<item caption="Hul eller rift kl (anfør herunder)" value="Hul eller rift kl"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.osin.periferi.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="90d_linse.periferi.andet.osin">
<label caption="Andet:"/>
- <lineedit name="90d_linse.osin.periferi.andet"/>
+ <lineedit name="90d_linse.periferi.andet.osin"/>
</altitem>
</altcombobox>
- <frame name="hul_eller_rift.osin.frame" layout="hbox">
+ <frame name="hul_eller_rift.frame.osin" layout="hbox">
<label caption="Hul eller rift kl.:"/>
- <combobox name="90dlinse.osin.hul_eller_rift_kl">
+ <combobox name="90dlinse.hul_eller_rift_kl.osin">
<item caption="1" value="1"/>
<item caption="2" value="2"/>
<item caption="3" value="3"/>
@@ -342,7 +342,7 @@
</frame>
<label caption="Supplerende:"/>
- <lineedit name="90d_linse.osin.supplerende"/>
+ <lineedit name="90d_linse.supplerende.osin"/>
</frame>
</frame>
diff --git a/server/xml/macros/ref_behandling-kirurgisk_procedure-1.0.xml b/server/xml/macros/ref_behandling-kirurgisk_procedure-1.0.xml
index 7b28761..a0e6803 100644
--- a/server/xml/macros/ref_behandling-kirurgisk_procedure-1.0.xml
+++ b/server/xml/macros/ref_behandling-kirurgisk_procedure-1.0.xml
@@ -2,7 +2,7 @@
<macro name="ref_behandling.kirurgisk_procedure" version="1.0">
<resume language="lua">
out = ''
- out = out .. 'I Oxybuprokain dråbeanæstesi foretages ' .. getValue('ref_behandling.kirurgisk_procedure.type') .. ' på ' .. getValue('ref_behandling.kirurgisk_procedure.eye') .. ' øje.\n'
+ out = out .. 'I Oxybuprokain dråbeanæstesi foretages ' .. getValue('ref_behandling.kirurgisk_procedure.type') .. ' på ' .. getValue('ref_behandling.kirurgisk_procedure.oeje') .. ' øje.\n'
if ( getValue('ref_behandling.kirurgisk_procedure.type') == 'LASIK' )
then
@@ -282,7 +282,7 @@
<item caption="LASEK" value="LASEK"/>
</combobox>
<label caption="på"/>
- <combobox name="ref_behandling.kirurgisk_procedure.eye" value="">
+ <combobox name="ref_behandling.kirurgisk_procedure.oeje" value="">
<item caption="højre" value="højre"/>
<item caption="venstre" value="venstre"/>
</combobox>
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>
diff --git a/server/xml/macros/spaltelampe-template-1.0.xml b/server/xml/macros/spaltelampe-template-1.0.xml
index 26a72db..a983226 100644
--- a/server/xml/macros/spaltelampe-template-1.0.xml
+++ b/server/xml/macros/spaltelampe-template-1.0.xml
@@ -2,245 +2,245 @@
<macro name="spaltelampe-template" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('spaltelampe.odxt.missing') == '' )
+ if ( getValue('spaltelampe.mangler.odxt') == '' )
then
out = out .. 'Spaltelampe, o.dxt:\n'
- if ( getValue('spaltelampe.odxt.konjuktiva') ~= '' )
+ if ( getValue('spaltelampe.konjuktiva.odxt') ~= '' )
then
- out = out .. 'Konjuktiva: ' .. getValue('spaltelampe.odxt.konjuktiva') .. '\n'
+ out = out .. 'Konjuktiva: ' .. getValue('spaltelampe.konjuktiva.odxt') .. '\n'
end
out = out .. 'Cornea:\n'
- if ( getValue('spaltelampe.odxt.epitel.intakt') ~= '' or getValue('spaltelampe.odxt.epitel.central_epiteldefekt') ~= '' or getValue('spaltelampe.odxt.epitel.toerhedsforandringer') ~= '' or getValue('spaltelampe.odxt.epitel.andet') ~= '')
+ if ( getValue('spaltelampe.epitel.intakt.odxt') ~= '' or getValue('spaltelampe.epitel.central_epiteldefekt.odxt') ~= '' or getValue('spaltelampe.epitel.toerhedsforandringer.odxt') ~= '' or getValue('spaltelampe.epitel.andet.odxt') ~= '')
then
out = out .. ' Epitel: '
end
- if ( getValue('spaltelampe.odxt.epitel.intakt') ~= '' )
+ if ( getValue('spaltelampe.epitel.intakt.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.epitel.intakt')
- if ( getValue('spaltelampe.odxt.epitel.central_epiteldefekt') ~= '' or getValue('spaltelampe.odxt.epitel.toerhedsforandringer') ~= '' or getValue('spaltelampe.odxt.epitel.andet') ~= '')
+ out = out .. getValue('spaltelampe.epitel.intakt.odxt')
+ if ( getValue('spaltelampe.epitel.central_epiteldefekt.odxt') ~= '' or getValue('spaltelampe.epitel.toerhedsforandringer.odxt') ~= '' or getValue('spaltelampe.epitel.andet.odxt') ~= '')
then
out = out .. ', '
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.odxt.epitel.central_epiteldefekt') ~= '' )
+ if ( getValue('spaltelampe.epitel.central_epiteldefekt.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.epitel.central_epiteldefekt')
- if (getValue('spaltelampe.odxt.epitel.toerhedsforandringer') ~= '' or getValue('spaltelampe.odxt.epitel.andet') ~= '')
+ out = out .. getValue('spaltelampe.epitel.central_epiteldefekt.odxt')
+ if (getValue('spaltelampe.epitel.toerhedsforandringer.odxt') ~= '' or getValue('spaltelampe.epitel.andet.odxt') ~= '')
then
out = out .. ', '
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.odxt.epitel.toerhedsforandringer') ~= '' )
+ if ( getValue('spaltelampe.epitel.toerhedsforandringer.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.epitel.toerhedsforandringer')
- if (getValue('spaltelampe.odxt.epitel.andet') ~= '')
+ out = out .. getValue('spaltelampe.epitel.toerhedsforandringer.odxt')
+ if (getValue('spaltelampe.epitel.andet.odxt') ~= '')
then
out = out .. ', '
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.odxt.epitel.andet') ~= '' )
+ if ( getValue('spaltelampe.epitel.andet.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.epitel.andet') .. '\n'
+ out = out .. getValue('spaltelampe.epitel.andet.odxt') .. '\n'
end
- if ( getValue('spaltelampe.odxt.stroma') ~= '' )
+ if ( getValue('spaltelampe.stroma.odxt') ~= '' )
then
- out = out .. ' Stroma: ' .. getValue('spaltelampe.odxt.stroma') .. '\n'
+ out = out .. ' Stroma: ' .. getValue('spaltelampe.stroma.odxt') .. '\n'
end
- if ( getValue('spaltelampe.odxt.flap') ~= '' )
+ if ( getValue('spaltelampe.flap.odxt') ~= '' )
then
- out = out .. ' Flap: ' .. getValue('spaltelampe.odxt.flap') .. '\n'
+ out = out .. ' Flap: ' .. getValue('spaltelampe.flap.odxt') .. '\n'
end
- if ( getValue('spaltelampe.odxt.folder') ~= '' )
+ if ( getValue('spaltelampe.folder.odxt') ~= '' )
then
- out = out .. ' Folder: ' .. getValue('spaltelampe.odxt.folder') .. '\n'
+ out = out .. ' Folder: ' .. getValue('spaltelampe.folder.odxt') .. '\n'
end
- if ( getValue('spaltelampe.odxt.interface.partikler') ~= '' or getValue('spaltelampe.odxt.interface.epitelindvaekst') ~= '' )
+ if ( getValue('spaltelampe.interface.partikler.odxt') ~= '' or getValue('spaltelampe.interface.epitelindvaekst.odxt') ~= '' )
then
out = out .. ' Interface: '
- if ( getValue('spaltelampe.odxt.interface.partikler') ~= '' )
+ if ( getValue('spaltelampe.interface.partikler.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.interface.partikler')
- if ( getValue('spaltelampe.odxt.interface.epitelindvaekst') ~= '' )
+ out = out .. getValue('spaltelampe.interface.partikler.odxt')
+ if ( getValue('spaltelampe.interface.epitelindvaekst.odxt') ~= '' )
then
out = out .. ', '
end
end
- if ( getValue('spaltelampe.odxt.interface.epitelindvaekst') ~= '' )
+ if ( getValue('spaltelampe.interface.epitelindvaekst.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.interface.epitelindvaekst') .. '\n'
+ out = out .. getValue('spaltelampe.interface.epitelindvaekst.odxt') .. '\n'
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.odxt.endothel') ~= '' )
+ if ( getValue('spaltelampe.endothel.odxt') ~= '' )
then
- out = out .. ' Endothel: ' .. getValue('spaltelampe.odxt.endothel') .. '\n'
+ out = out .. ' Endothel: ' .. getValue('spaltelampe.endothel.odxt') .. '\n'
end
- if ( getValue('spaltelampe.odxt.lens') ~= '' )
+ if ( getValue('spaltelampe.lens.odxt') ~= '' )
then
- out = out .. 'Lens: ' .. getValue('spaltelampe.odxt.lens') .. '\n'
+ out = out .. 'Lens: ' .. getValue('spaltelampe.lens.odxt') .. '\n'
end
- if ( getValue('spaltelampe.odxt.supplerende') ~= '' )
+ if ( getValue('spaltelampe.supplerende.odxt') ~= '' )
then
- out = out .. getValue('spaltelampe.odxt.supplerende') .. '\n'
+ out = out .. getValue('spaltelampe.supplerende.odxt') .. '\n'
end
end
- if ( getValue('spaltelampe.osin.missing') == '' )
+ if ( getValue('spaltelampe.mangler.osin') == '' )
then
- if ( getValue('spaltelampe.odxt.missing') == '' )
+ if ( getValue('spaltelampe.mangler.odxt') == '' )
then
out = out .. '\n'
end
out = out .. 'Spaltelampe, o.sin:\n'
- if ( getValue('spaltelampe.osin.konjuktiva') ~= '' )
+ if ( getValue('spaltelampe.konjuktiva.osin') ~= '' )
then
- out = out .. 'Konjuktiva: ' .. getValue('spaltelampe.osin.konjuktiva') .. '\n'
+ out = out .. 'Konjuktiva: ' .. getValue('spaltelampe.konjuktiva.osin') .. '\n'
end
out = out .. 'Cornea:\n'
- if ( getValue('spaltelampe.osin.epitel.intakt') ~= '' or getValue('spaltelampe.osin.epitel.central_epiteldefekt') ~= '' or getValue('spaltelampe.osin.epitel.toerhedsforandringer') ~= '' or getValue('spaltelampe.osin.epitel.andet') ~= '')
+ if ( getValue('spaltelampe.epitel.intakt.osin') ~= '' or getValue('spaltelampe.epitel.central_epiteldefekt.osin') ~= '' or getValue('spaltelampe.epitel.toerhedsforandringer.osin') ~= '' or getValue('spaltelampe.epitel.andet.osin') ~= '')
then
out = out .. ' Epitel: '
end
- if ( getValue('spaltelampe.osin.epitel.intakt') ~= '' )
+ if ( getValue('spaltelampe.epitel.intakt.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.epitel.intakt')
- if ( getValue('spaltelampe.osin.epitel.central_epiteldefekt') ~= '' or getValue('spaltelampe.osin.epitel.toerhedsforandringer') ~= '' or getValue('spaltelampe.osin.epitel.andet') ~= '')
+ out = out .. getValue('spaltelampe.epitel.intakt.osin')
+ if ( getValue('spaltelampe.epitel.central_epiteldefekt.osin') ~= '' or getValue('spaltelampe.epitel.toerhedsforandringer.osin') ~= '' or getValue('spaltelampe.epitel.andet.osin') ~= '')
then
out = out .. ', '
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.osin.epitel.central_epiteldefekt') ~= '' )
+ if ( getValue('spaltelampe.epitel.central_epiteldefekt.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.epitel.central_epiteldefekt')
- if (getValue('spaltelampe.osin.epitel.toerhedsforandringer') ~= '' or getValue('spaltelampe.osin.epitel.andet') ~= '')
+ out = out .. getValue('spaltelampe.epitel.central_epiteldefekt.osin')
+ if (getValue('spaltelampe.epitel.toerhedsforandringer.osin') ~= '' or getValue('spaltelampe.epitel.andet.osin') ~= '')
then
out = out .. ', '
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.osin.epitel.toerhedsforandringer') ~= '' )
+ if ( getValue('spaltelampe.epitel.toerhedsforandringer.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.epitel.toerhedsforandringer')
- if (getValue('spaltelampe.osin.epitel.andet') ~= '')
+ out = out .. getValue('spaltelampe.epitel.toerhedsforandringer.osin')
+ if (getValue('spaltelampe.epitel.andet.osin') ~= '')
then
out = out .. ', '
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.osin.epitel.andet') ~= '' )
+ if ( getValue('spaltelampe.epitel.andet.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.epitel.andet') .. '\n'
+ out = out .. getValue('spaltelampe.epitel.andet.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.epitel') ~= '' )
+ if ( getValue('spaltelampe.epitel.osin') ~= '' )
then
- out = out .. ' Epitel: ' .. getValue('spaltelampe.osin.epitel') .. '\n'
+ out = out .. ' Epitel: ' .. getValue('spaltelampe.epitel.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.stroma') ~= '' )
+ if ( getValue('spaltelampe.stroma.osin') ~= '' )
then
- out = out .. ' Stroma: ' .. getValue('spaltelampe.osin.stroma') .. '\n'
+ out = out .. ' Stroma: ' .. getValue('spaltelampe.stroma.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.flap') ~= '' )
+ if ( getValue('spaltelampe.flap.osin') ~= '' )
then
- out = out .. ' Flap: ' .. getValue('spaltelampe.osin.flap') .. '\n'
+ out = out .. ' Flap: ' .. getValue('spaltelampe.flap.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.folder') ~= '' )
+ if ( getValue('spaltelampe.folder.osin') ~= '' )
then
- out = out .. ' Folder: ' .. getValue('spaltelampe.osin.folder') .. '\n'
+ out = out .. ' Folder: ' .. getValue('spaltelampe.folder.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.interface.partikler') ~= '' or getValue('spaltelampe.osin.interface.epitelindvaekst') ~= '' )
+ if ( getValue('spaltelampe.interface.partikler.osin') ~= '' or getValue('spaltelampe.interface.epitelindvaekst.osin') ~= '' )
then
out = out .. ' Interface: '
- if ( getValue('spaltelampe.osin.interface.partikler') ~= '' )
+ if ( getValue('spaltelampe.interface.partikler.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.interface.partikler')
- if ( getValue('spaltelampe.osin.interface.epitelindvaekst') ~= '' )
+ out = out .. getValue('spaltelampe.interface.partikler.osin')
+ if ( getValue('spaltelampe.interface.epitelindvaekst.osin') ~= '' )
then
out = out .. ', '
end
end
- if ( getValue('spaltelampe.osin.interface.epitelindvaekst') ~= '' )
+ if ( getValue('spaltelampe.interface.epitelindvaekst.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.interface.epitelindvaekst') .. '\n'
+ out = out .. getValue('spaltelampe.interface.epitelindvaekst.osin') .. '\n'
else
out = out .. '\n'
end
end
- if ( getValue('spaltelampe.osin.endothel') ~= '' )
+ if ( getValue('spaltelampe.endothel.osin') ~= '' )
then
- out = out .. ' Endothel: ' .. getValue('spaltelampe.osin.endothel') .. '\n'
+ out = out .. ' Endothel: ' .. getValue('spaltelampe.endothel.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.lens') ~= '' )
+ if ( getValue('spaltelampe.lens.osin') ~= '' )
then
- out = out .. 'Lens: ' .. getValue('spaltelampe.osin.lens') .. '\n'
+ out = out .. 'Lens: ' .. getValue('spaltelampe.lens.osin') .. '\n'
end
- if ( getValue('spaltelampe.osin.supplerende') ~= '' )
+ if ( getValue('spaltelampe.supplerende.osin') ~= '' )
then
- out = out .. getValue('spaltelampe.osin.supplerende') .. '\n'
+ out = out .. getValue('spaltelampe.supplerende.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
@@ -274,8 +274,8 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="spaltelampe.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="spaltelampe.mangler.odxt" script="right_eye"
+ map="missing_eye_odxt_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="right_eye_frame" caption="o.dxt" layout="vbox">
@@ -285,13 +285,13 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.konjuktiva" layout="vbox" value="Bleg">
+ <altcombobox name="spaltelampe.konjuktiva.odxt" layout="vbox" value="Bleg">
<item caption="Ikke udfyldt" value=""/>
<item caption="Bleg" value="Bleg"/>
<item caption="Injiceret" value="Injiceret"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.konjuktiva.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.konjuktiva.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.konjuktiva.andet"/>
+ <lineedit name="spaltelampe.konjuktiva.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -308,12 +308,12 @@
<label/>
</frame>
<frame layout="vbox">
- <checkbox name="spaltelampe.odxt.epitel.intakt" caption="Intakt" falsevalue="" truevalue="Intakt"/>
- <checkbox name="spaltelampe.odxt.epitel.central_epiteldefekt" caption="Central epiteldefekt" falsevalue="" truevalue="Central epiteldefekt"/>
- <checkbox name="spaltelampe.odxt.epitel.toerhedsforandringer" caption="Tørhedsforandringer" falsevalue="" truevalue="Tørhedsforandringer"/>
+ <checkbox name="spaltelampe.epitel.intakt.odxt" caption="Intakt" falsevalue="" truevalue="Intakt"/>
+ <checkbox name="spaltelampe.epitel.central_epiteldefekt.odxt" caption="Central epiteldefekt" falsevalue="" truevalue="Central epiteldefekt"/>
+ <checkbox name="spaltelampe.epitel.toerhedsforandringer.odxt" caption="Tørhedsforandringer" falsevalue="" truevalue="Tørhedsforandringer"/>
<frame layout="hbox">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.epitel.andet"/>
+ <lineedit name="spaltelampe.epitel.andet.odxt"/>
</frame>
</frame>
</frame>
@@ -323,7 +323,7 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.stroma" layout="vbox" value="Klart">
+ <altcombobox name="spaltelampe.stroma.odxt" layout="vbox" value="Klart">
<item caption="Ikke udfyldt" value=""/>
<item caption="Klart" value="Klart"/>
<item caption="Karindvækst" value="Karindvækst"/>
@@ -334,9 +334,9 @@
<item caption="Nogen haze - grad 2" value="Nogen haze - grad 2"/>
<item caption="Udtalt haze - grad 3" value="Udtalt haze - grad 3"/>
<item caption="Massiv haze - grad 4" value="Massiv haze - grad 4"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.stroma.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.stroma.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.stroma.andet"/>
+ <lineedit name="spaltelampe.stroma.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -348,13 +348,13 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.flap" layout="vbox" value="">
+ <altcombobox name="spaltelampe.flap.odxt" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Velplaceret" value="Velplaceret"/>
<item caption="Dislokeret" value="Dislokeret"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.flap.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.flap.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.flap.andet"/>
+ <lineedit name="spaltelampe.flap.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -366,15 +366,15 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.folder" layout="vbox" value="">
+ <altcombobox name="spaltelampe.folder.odxt" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Ingen" value="Ingen"/>
<item caption="Mikrofolder" value="Mikrofolder"/>
<item caption="Lette folder" value="Lette folder"/>
<item caption="Udtalte folder" value="Udtalte folder"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.folder.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.folder.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.folder.andet"/>
+ <lineedit name="spaltelampe.folder.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -388,26 +388,26 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.interface.partikler" layout="vbox" value="">
+ <altcombobox name="spaltelampe.interface.partikler.odxt" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Ingen partikler eller debris" value="Ingen partikler eller debris"/>
<item caption="Enkelte partikler" value="Enkelte partikler"/>
<item caption="Nogen partikler" value="Nogen partikler"/>
<item caption="Udtalte partikler" value="Udtalte partikler"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.interface.partikler.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.interface.partikler.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.interface.partikler.andet"/>
+ <lineedit name="spaltelampe.interface.partikler.andet.odxt"/>
</altitem>
</altcombobox>
- <altcombobox name="spaltelampe.odxt.interface.epitelindvaekst" layout="vbox" value="">
+ <altcombobox name="spaltelampe.interface.epitelindvaekst.odxt" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Ingen epitelindvækst" value="Ingen epitelindvækst"/>
<item caption="Diskret epitelindvækst" value="Diskret epitelindvækst"/>
<item caption="Let epitelindvækst" value="Let epitelindvækst"/>
<item caption="Betydende epitelindvækst" value="Betydende epitelindvækst"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.interface.epitelindvaekst.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.interface.epitelindvaekst.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.interface.epitelindvaekst.andet"/>
+ <lineedit name="spaltelampe.interface.epitelindvaekst.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -419,12 +419,12 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.endothel" layout="vbox" value="Upåfaldende">
+ <altcombobox name="spaltelampe.endothel.odxt" layout="vbox" value="Upåfaldende">
<item caption="Upåfaldende" value="Upåfaldende"/>
<item caption="Guttatae" value="Guttatae"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.endothel.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.endothel.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.endothel.andet"/>
+ <lineedit name="spaltelampe.endothel.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -438,16 +438,16 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.odxt.lens" layout="vbox" value="Klar">
+ <altcombobox name="spaltelampe.lens.odxt" layout="vbox" value="Klar">
<item caption="Klar" value="Klar"/>
<item caption="Katarakt-1" value="Katarakt-1"/>
<item caption="Katarakt-2" value="Katarakt-2"/>
<item caption="Katarakt-3" value="Katarakt-3"/>
<item caption="Katarakt-4" value="Katarakt-4"/>
<item caption="Pseudofak" value="Pseudofak"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.odxt.lens.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.lens.andet.odxt">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.odxt.lens.andet"/>
+ <lineedit name="spaltelampe.lens.andet.odxt"/>
</altitem>
</altcombobox>
</frame>
@@ -455,7 +455,7 @@
<frame layout="vbox">
<label caption="Supplerende:"/>
- <lineedit name="spaltelampe.odxt.supplerende"/>
+ <lineedit name="spaltelampe.supplerende.odxt"/>
</frame>
</frame>
@@ -464,8 +464,8 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="spaltelampe.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="spaltelampe.mangler.osin" script="left_eye"
+ map="missing_eye_osin_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="left_eye_frame" caption="o.sin" layout="vbox">
@@ -475,13 +475,13 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.konjuktiva" layout="vbox" value="Bleg">
+ <altcombobox name="spaltelampe.konjuktiva.osin" layout="vbox" value="Bleg">
<item caption="Ikke udfyldt" value=""/>
<item caption="Bleg" value="Bleg"/>
<item caption="Injiceret" value="Injiceret"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.konjuktiva.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.konjuktiva.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.konjuktiva.andet"/>
+ <lineedit name="spaltelampe.konjuktiva.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -498,12 +498,12 @@
<label/>
</frame>
<frame layout="vbox">
- <checkbox name="spaltelampe.osin.epitel.intakt" caption="Intakt" falsevalue="" truevalue="Intakt"/>
- <checkbox name="spaltelampe.osin.epitel.central_epiteldefekt" caption="Central epiteldefekt" falsevalue="" truevalue="Central epiteldefekt"/>
- <checkbox name="spaltelampe.osin.epitel.toerhedsforandringer" caption="Tørhedsforandringer" falsevalue="" truevalue="Tørhedsforandringer"/>
+ <checkbox name="spaltelampe.epitel.intakt.osin" caption="Intakt" falsevalue="" truevalue="Intakt"/>
+ <checkbox name="spaltelampe.epitel.central_epiteldefekt.osin" caption="Central epiteldefekt" falsevalue="" truevalue="Central epiteldefekt"/>
+ <checkbox name="spaltelampe.epitel.toerhedsforandringer.osin" caption="Tørhedsforandringer" falsevalue="" truevalue="Tørhedsforandringer"/>
<frame layout="hbox">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.epitel.andet"/>
+ <lineedit name="spaltelampe.epitel.andet.osin"/>
</frame>
</frame>
</frame>
@@ -513,7 +513,7 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.stroma" layout="vbox" value="Klart">
+ <altcombobox name="spaltelampe.stroma.osin" layout="vbox" value="Klart">
<item caption="Ikke udfyldt" value=""/>
<item caption="Klart" value="Klart"/>
<item caption="Karindvækst" value="Karindvækst"/>
@@ -524,9 +524,9 @@
<item caption="Nogen haze - grad 2" value="Nogen haze - grad 2"/>
<item caption="Udtalt haze - grad 3" value="Udtalt haze - grad 3"/>
<item caption="Massiv haze - grad 4" value="Massiv haze - grad 4"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.stroma.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.stroma.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.stroma.andet"/>
+ <lineedit name="spaltelampe.stroma.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -538,13 +538,13 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.flap" layout="vbox" value="">
+ <altcombobox name="spaltelampe.flap.osin" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Velplaceret" value="Velplaceret"/>
<item caption="Dislokeret" value="Dislokeret"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.flap.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.flap.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.flap.andet"/>
+ <lineedit name="spaltelampe.flap.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -556,15 +556,15 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.folder" layout="vbox" value="">
+ <altcombobox name="spaltelampe.folder.osin" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Ingen" value="Ingen"/>
<item caption="Mikrofolder" value="Mikrofolder"/>
<item caption="Lette folder" value="Lette folder"/>
<item caption="Udtalte folder" value="Udtalte folder"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.folder.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.folder.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.folder.andet"/>
+ <lineedit name="spaltelampe.folder.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -578,26 +578,26 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.partikler" layout="vbox" value="">
+ <altcombobox name="spaltelampe.partikler.osin" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Ingen partikler eller debris" value="Ingen partikler eller debris"/>
<item caption="Enkelte partikler" value="Enkelte partikler"/>
<item caption="Nogen partikler" value="Nogen partikler"/>
<item caption="Udtalte partikler" value="Udtalte partikler"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.partikler.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.partikler.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.partikler.andet"/>
+ <lineedit name="spaltelampe.partikler.andet.osin"/>
</altitem>
</altcombobox>
- <altcombobox name="spaltelampe.osin.epitelindvaekst" layout="vbox" value="">
+ <altcombobox name="spaltelampe.epitelindvaekst.osin" layout="vbox" value="">
<item caption="Ej relevant" value=""/>
<item caption="Ingen epitelindvækst" value="Ingen epitelindvækst"/>
<item caption="Diskret epitelindvækst" value="Diskret epitelindvækst"/>
<item caption="Let epitelindvækst" value="Let epitelindvækst"/>
<item caption="Betydende epitelindvækst" value="Betydende epitelindvækst"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.epitelindvaekst.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.epitelindvaekst.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.epitelindvaekst.andet"/>
+ <lineedit name="spaltelampe.epitelindvaekst.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -609,12 +609,12 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.endothel" layout="vbox" value="Upåfaldende">
+ <altcombobox name="spaltelampe.endothel.osin" layout="vbox" value="Upåfaldende">
<item caption="Upåfaldende" value="Upåfaldende"/>
<item caption="Guttatae" value="Guttatae"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.endothel.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.endothel.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.endothel.andet"/>
+ <lineedit name="spaltelampe.endothel.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -628,16 +628,16 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.osin.lens" layout="vbox" value="Klar">
+ <altcombobox name="spaltelampe.lens.osin" layout="vbox" value="Klar">
<item caption="Klar" value="Klar"/>
<item caption="Katarakt-1" value="Katarakt-1"/>
<item caption="Katarakt-2" value="Katarakt-2"/>
<item caption="Katarakt-3" value="Katarakt-3"/>
<item caption="Katarakt-4" value="Katarakt-4"/>
<item caption="Pseudofak" value="Pseudofak"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.osin.lens.andet">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.lens.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.osin.lens.andet"/>
+ <lineedit name="spaltelampe.lens.andet.osin"/>
</altitem>
</altcombobox>
</frame>
@@ -645,7 +645,7 @@
<frame layout="vbox">
<label caption="Supplerende:"/>
- <lineedit name="spaltelampe.osin.supplerende"/>
+ <lineedit name="spaltelampe.supplerende.osin"/>
</frame>
</frame>
diff --git a/server/xml/macros/tidligere_oejensygdomme-1.0.xml b/server/xml/macros/tidligere_oejensygdomme-1.0.xml
index 6c2f836..f86bd94 100644
--- a/server/xml/macros/tidligere_oejensygdomme-1.0.xml
+++ b/server/xml/macros/tidligere_oejensygdomme-1.0.xml
@@ -14,8 +14,8 @@
<macro name="tidligere_oejensygdomme" version="1.0">
<resume>Tidligere øjensygdomme:
${previous_eye_diseases}
-${missing_eye_right}
-${missing_eye_left}</resume>
+${missing_eye_odxt}
+${missing_eye_osin}</resume>
<queries>
</queries>
<maps>
@@ -36,10 +36,10 @@ ${missing_eye_left}</resume>
<frame layout="hbox" caption="Specifikt for det videre forløb">
<frame layout="hbox">
<checkbox caption="Intet o.dxt."
- name="missing_eye_right"
+ name="missing_eye_odxt"
truevalue="Intet o.dxt." falsevalue="" value=""/>
<checkbox caption="Intet o.sin."
- name="missing_eye_left"
+ name="missing_eye_osin"
truevalue="Intet o.sin." falsevalue="" value=""/>
</frame>
</frame>
diff --git a/server/xml/macros/tonometri-1.0.xml b/server/xml/macros/tonometri-1.0.xml
index 61902a8..7cf9d0e 100644
--- a/server/xml/macros/tonometri-1.0.xml
+++ b/server/xml/macros/tonometri-1.0.xml
@@ -2,64 +2,64 @@
<macro name="tonometri" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('tonometri.odxt.missing') == '' or getValue('tonometri.osin.missing') == '' )
+ if ( getValue('tonometri.mangler.odxt') == '' or getValue('tonometri.mangler.osin') == '' )
then
out = out .. getValue('tonometri.method') .. ':\n'
end
- if ( getValue('tonometri.odxt.missing') == '' )
+ if ( getValue('tonometri.mangler.odxt') == '' )
then
- out = out .. 'o.dxt: ' .. getValue('tonometri.odxt.pressure') .. ' mmHg\n'
+ out = out .. 'o.dxt: ' .. getValue('tonometri.pressure.odxt') .. ' mmHg\n'
end
- if ( getValue('tonometri.osin.missing') == '' )
+ if ( getValue('tonometri.mangler.osin') == '' )
then
- out = out .. 'o.sin: ' .. getValue('tonometri.osin.pressure') .. ' mmHg\n'
+ out = out .. 'o.sin: ' .. getValue('tonometri.pressure.osin') .. ' mmHg\n'
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
@@ -88,7 +88,7 @@
enable('right_eye_frame')
end
- if( getValue('tonometri.odxt.missing') == 'mangler' and getValue('tonometri.osin.missing') == 'mangler' )
+ if( getValue('tonometri.mangler.odxt') == 'mangler' and getValue('tonometri.mangler.osin') == 'mangler' )
then
disable('device_frame')
else
@@ -105,7 +105,7 @@
enable('left_eye_frame')
end
- if( getValue('tonometri.odxt.missing') == 'mangler' and getValue('tonometri.osin.missing') == 'mangler' )
+ if( getValue('tonometri.mangler.odxt') == 'mangler' and getValue('tonometri.mangler.osin') == 'mangler' )
then
disable('device_frame')
else
@@ -123,13 +123,13 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="tonometri.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="tonometri.mangler.odxt" script="right_eye"
+ map="missing_eye_odxt_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="right_eye_frame" caption="o.dxt" layout="hbox">
<label caption="Tryk:"/>
<spacer/>
- <lineedit name="tonometri.odxt.pressure" regexp="\d{1,2}" script="lt80gt0" value=""/>
+ <lineedit name="tonometri.pressure.odxt" regexp="\d{1,2}" script="lt80gt0" value=""/>
<label caption="mmHg"/>
<spacer/>
</frame>
@@ -138,13 +138,13 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="tonometri.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="tonometri.mangler.osin" script="left_eye"
+ map="missing_eye_osin_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="left_eye_frame" caption="o.sin" layout="hbox">
<label caption="Tryk:"/>
<spacer/>
- <lineedit name="tonometri.osin.pressure" regexp="\d{1,2}" script="lt80gt0" value=""/>
+ <lineedit name="tonometri.pressure.osin" regexp="\d{1,2}" script="lt80gt0" value=""/>
<label caption="mmHg"/>
<spacer/>
</frame>
diff --git a/server/xml/macros/topografi-1.0.xml b/server/xml/macros/topografi-1.0.xml
index 92a4027..7eedcfa 100644
--- a/server/xml/macros/topografi-1.0.xml
+++ b/server/xml/macros/topografi-1.0.xml
@@ -2,19 +2,19 @@
<macro name="topografi" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('topografi.odxt.missing') == '' or getValue('topografi.osin.missing') == '' )
+ if ( getValue('topografi.mangler.odxt') == '' or getValue('topografi.mangler.osin') == '' )
then
out = out .. 'Topografi, ' .. getValue('topografi.method') .. ':\n'
end
- if ( getValue('topografi.odxt.missing') == '' )
+ if ( getValue('topografi.mangler.odxt') == '' )
then
- out = out .. 'o.dxt: ' .. getValue('topografi.odxt.judgement') .. '\n'
+ out = out .. 'o.dxt: ' .. getValue('topografi.judgement.odxt') .. '\n'
end
- if ( getValue('topografi.osin.missing') == '' )
+ if ( getValue('topografi.mangler.osin') == '' )
then
- out = out .. 'o.sin: ' .. getValue('topografi.osin.judgement') .. '\n'
+ out = out .. 'o.sin: ' .. getValue('topografi.judgement.osin') .. '\n'
end
return out
@@ -22,38 +22,38 @@
<queries>
</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
@@ -101,23 +101,23 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="topografi.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="topografi.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">
- <altcombobox name="topografi.odxt.judgement" layout="vbox">
+ <altcombobox name="topografi.judgement.odxt" layout="vbox">
<item caption="Symmetrisk cornea" value="Symmetrisk cornea"/>
<item caption="Regelmæssig astigmatisme" value="Regelmæssig astigmatisme"/>
<item caption="Uregelmæssig astigmatisme" value="Uregelmæssig astigmatisme"/>
<item caption="Keratoconus" value="Keratoconus"/>
<item caption="Centreret ablationer" value="Centreret ablationer"/>
<item caption="Decentreret ablationer" value="Decentreret ablationer"/>
- <altitem caption="Andet" value="andet" innerwidget="topografi.odxt.andet">
+ <altitem caption="Andet" value="andet" innerwidget="topografi.andet.odxt">
<frame layout="hbox">
<label caption="Andet:"/>
- <lineedit name="topografi.odxt.andet"/>
+ <lineedit name="topografi.andet.odxt"/>
</frame>
</altitem>
</altcombobox>
@@ -129,23 +129,23 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="topografi.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="topografi.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">
- <altcombobox name="topografi.osin.judgement" layout="vbox">
+ <altcombobox name="topografi.judgement.osin" layout="vbox">
<item caption="Symmetrisk cornea" value="Symmetrisk cornea"/>
<item caption="Regelmæssig astigmatisme" value="Regelmæssig astigmatisme"/>
<item caption="Uregelmæssig astigmatisme" value="Uregelmæssig astigmatisme"/>
<item caption="Keratoconus" value="Keratoconus"/>
<item caption="Centreret ablationer" value="Centreret ablationer"/>
<item caption="Decentreret ablationer" value="Decentreret ablationer"/>
- <altitem caption="Andet" value="andet" innerwidget="topografi.osin.andet">
+ <altitem caption="Andet" value="andet" innerwidget="topografi.andet.osin">
<frame layout="hbox">
<label caption="Andet:"/>
- <lineedit name="topografi.osin.andet"/>
+ <lineedit name="topografi.andet.osin"/>
</frame>
</altitem>
</altcombobox>
diff --git a/server/xml/macros/visus-1.0.xml b/server/xml/macros/visus-1.0.xml
index 4aad946..9319005 100644
--- a/server/xml/macros/visus-1.0.xml
+++ b/server/xml/macros/visus-1.0.xml
@@ -18,83 +18,83 @@
<macro name="visus" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('snellen.odxt.missing') == '' or getValue('snellen.osin.missing') == '' )
+ if ( getValue('snellen.mangler.odxt') == '' or getValue('snellen.mangler.osin') == '' )
then
out = out .. 'Objektivt:\n'
- if ( getValue('snellen.odxt.missing') == '' )
+ if ( getValue('snellen.mangler.odxt') == '' )
then
out = out .. 'Visus o.dxt. ' .. getValue('snellen.odxt') .. '\n'
out = out .. 'ETDRS o.dxt. ' .. getValue('etdrs.odxt') .. '\n'
- if ( getValue('snellen.odxt.korr.basis') ~= 'Ingen' )
+ if ( getValue('snellen.korr.basis.odxt') ~= 'Ingen' )
then
- out = out .. 'Korr.: ' .. getValue('snellen.odxt.korr.basis') .. ' add '
+ out = out .. 'Korr.: ' .. getValue('snellen.korr.basis.odxt') .. ' add '
else
out = out .. 'Korr.: add '
end
- out = out .. getValue('snellen.odxt.korr.sf') .. ' sf, '
- .. getValue('snellen.odxt.korr.cyl') .. '.sf '
- .. getValue('snellen.odxt.korr.grader') .. ' grader.\n'
+ out = out .. getValue('snellen.korr.sf.odxt') .. ' sf, '
+ .. getValue('snellen.korr.cyl.odxt') .. '.sf '
+ .. getValue('snellen.korr.grader.odxt') .. ' grader.\n'
end
- if ( getValue('snellen.osin.missing') == '' )
+ if ( getValue('snellen.mangler.osin') == '' )
then
out = out .. 'Visus o.sin. ' .. getValue('snellen.osin') .. '\n'
out = out .. 'ETDRS o.sin. ' .. getValue('etdrs.osin') .. '\n'
- if ( getValue('snellen.osin.korr.basis') ~= 'Ingen' )
+ if ( getValue('snellen.korr.basis.osin') ~= 'Ingen' )
then
- out = out .. 'Korr.: ' .. getValue('snellen.osin.korr.basis') .. ' add '
+ out = out .. 'Korr.: ' .. getValue('snellen.korr.basis.osin') .. ' add '
else
out = out .. 'Korr.: add '
end
- out = out .. getValue('snellen.osin.korr.sf') .. ' sf, '
- .. getValue('snellen.osin.korr.cyl') .. '.sf '
- .. getValue('snellen.osin.korr.grader') .. ' grader.\n'
+ out = out .. getValue('snellen.korr.sf.osin') .. ' sf, '
+ .. getValue('snellen.korr.cyl.osin') .. '.sf '
+ .. getValue('snellen.korr.grader.osin') .. ' grader.\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
@@ -177,8 +177,8 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="snellen.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="snellen.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">
@@ -337,7 +337,7 @@
</frame>
<frame layout="vbox">
<label caption="Basis:"/>
- <combobox name="snellen.odxt.korr.basis" value="">
+ <combobox name="snellen.korr.basis.odxt" value="">
<item caption="Autoref." value="Autoref"/>
<item caption="Egen brille" value="Brille"/>
<item caption="Ingen" value="Ingen"/>
@@ -349,15 +349,15 @@
</frame>
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="snellen.odxt.korr.sf" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ <lineedit name="snellen.korr.sf.odxt" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="snellen.odxt.korr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ <lineedit name="snellen.korr.cyl.odxt" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="snellen.odxt.korr.grader" regexp="[\d]+" script="lt359gt0" value=""/>
+ <lineedit name="snellen.korr.grader.odxt" regexp="[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>
@@ -366,8 +366,8 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="snellen.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="snellen.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">
@@ -526,7 +526,7 @@
</frame>
<frame layout="vbox">
<label caption="Basis:"/>
- <combobox name="snellen.osin.korr.basis" value="">
+ <combobox name="snellen.korr.basis.osin" value="">
<item caption="Autoref." value="autoref"/>
<item caption="Egen brille" value="brille"/>
<item caption="Ingen" value="ingen"/>
@@ -538,15 +538,15 @@
</frame>
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="snellen.osin.korr.sf" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ <lineedit name="snellen.korr.sf.osin" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="snellen.osin.korr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ <lineedit name="snellen.korr.cyl.osin" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="snellen.osin.korr.grader" regexp="[\d]+" script="lt359gt0" value=""/>
+ <lineedit name="snellen.korr.grader.osin" regexp="[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>
diff --git a/server/xml/macros/visus-autoref-1.0.xml b/server/xml/macros/visus-autoref-1.0.xml
index 8d52293..b64e476 100644
--- a/server/xml/macros/visus-autoref-1.0.xml
+++ b/server/xml/macros/visus-autoref-1.0.xml
@@ -10,7 +10,7 @@
-->
<resume language="lua">
out = ''
- if ( getValue('visus.autoref.missing.odxt') == '' )
+ if ( getValue('visus.autoref.mangler.odxt') == '' )
then
out = out .. 'Visus, autoref, o.dxt'
if ( getValue('visus.autoref.kontrast.odxt') ~= '' )
@@ -41,13 +41,13 @@
end
out = out .. '\n'
- if ( getValue('visus.autoref.missing.osin') == '' )
+ if ( getValue('visus.autoref.mangler.osin') == '' )
then
out = out .. '\n'
end
end
- if ( getValue('visus.autoref.missing.osin') == '' )
+ if ( getValue('visus.autoref.mangler.osin') == '' )
then
out = out .. 'Visus, autoref, o.sin'
if ( getValue('visus.autoref.kontrast.osin') ~= '' )
@@ -78,7 +78,7 @@
end
out = out .. '\n'
- if ( getValue('visus.autoref.missing.osin') == '' )
+ if ( getValue('visus.autoref.mangler.osin') == '' )
then
out = out .. '\n'
end
@@ -87,46 +87,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
@@ -242,8 +242,8 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="visus.autoref.missing.odxt" script="right_eye"
- map="missing_eye_right_map"
+ name="visus.autoref.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">
@@ -427,8 +427,8 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="visus.autoref.missing.osin" script="left_eye"
- map="missing_eye_left_map"
+ name="visus.autoref.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">
diff --git a/server/xml/macros/visus-egen_korr-1.0.xml b/server/xml/macros/visus-egen_korr-1.0.xml
index 4f75c72..4f4d29f 100644
--- a/server/xml/macros/visus-egen_korr-1.0.xml
+++ b/server/xml/macros/visus-egen_korr-1.0.xml
@@ -11,12 +11,12 @@
-->
<resume language="lua">
out = ''
- if ( getValue('visus.egen_korr.missing.odxt') == '' or getValue('visus.egen_korr.missing.osin') == '' or getValue('visus.egen_korr.ou') ~= '' )
+ if ( getValue('visus.egen_korr.mangler.odxt') == '' or getValue('visus.egen_korr.mangler.osin') == '' or getValue('visus.egen_korr.ou') ~= '' )
then
out = out .. 'Visus egen korrektion:\n'
end
- if ( getValue('visus.egen_korr.missing.odxt') == '' )
+ if ( getValue('visus.egen_korr.mangler.odxt') == '' )
then
out = out .. 'o.dxt: '
if ( getValue('visus.egen_korr.snellen.odxt') ~= '' )
@@ -69,7 +69,7 @@
- if ( getValue('visus.egen_korr.missing.osin') == '' )
+ if ( getValue('visus.egen_korr.mangler.osin') == '' )
then
out = out .. 'o.sin: '
if ( getValue('visus.egen_korr.snellen.osin') ~= '' )
@@ -147,46 +147,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
@@ -398,8 +398,8 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="visus.egen_korr.missing.odxt" script="right_eye"
- map="missing_eye_right_map"
+ name="visus.egen_korr.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">
@@ -727,8 +727,8 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="visus.egen_korr.missing.osin" script="left_eye"
- map="missing_eye_left_map"
+ name="visus.egen_korr.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">
diff --git a/server/xml/macros/visus-manifest_refraktion-1.0.xml b/server/xml/macros/visus-manifest_refraktion-1.0.xml
index 66362a9..35236f6 100644
--- a/server/xml/macros/visus-manifest_refraktion-1.0.xml
+++ b/server/xml/macros/visus-manifest_refraktion-1.0.xml
@@ -11,12 +11,12 @@
-->
<resume language="lua">
out = ''
- if ( getValue('visus.manifest_refraktion.missing.odxt') == '' or getValue('visus.manifest_refraktion.missing.osin') == '' or getValue('visus.manifest_refraktion.ou') ~= '' )
+ if ( getValue('visus.manifest_refraktion.mangler.odxt') == '' or getValue('visus.manifest_refraktion.mangler.osin') == '' or getValue('visus.manifest_refraktion.ou') ~= '' )
then
out = out .. 'Visus optimal refraktion:\n'
end
- if ( getValue('visus.manifest_refraktion.missing.odxt') == '' )
+ if ( getValue('visus.manifest_refraktion.mangler.odxt') == '' )
then
out = out .. 'o.dxt: '
if ( getValue('visus.manifest_refraktion.snellen.odxt') ~= '' )
@@ -69,7 +69,7 @@
- if ( getValue('visus.manifest_refraktion.missing.osin') == '' )
+ if ( getValue('visus.manifest_refraktion.mangler.osin') == '' )
then
out = out .. 'o.sin: '
if ( getValue('visus.manifest_refraktion.snellen.osin') ~= '' )
@@ -147,46 +147,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
@@ -398,8 +398,8 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="visus.manifest_refraktion.missing.odxt" script="right_eye"
- map="missing_eye_right_map"
+ name="visus.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">
@@ -727,8 +727,8 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="visus.manifest_refraktion.missing.osin" script="left_eye"
- map="missing_eye_left_map"
+ name="visus.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">
diff --git a/server/xml/macros/visus-template-1.0.xml b/server/xml/macros/visus-template-1.0.xml
index 9e6794a..1e6cb13 100644
--- a/server/xml/macros/visus-template-1.0.xml
+++ b/server/xml/macros/visus-template-1.0.xml
@@ -11,12 +11,12 @@
-->
<resume language="lua">
out = ''
- if ( getValue('visus.template.missing.odxt') == '' or getValue('visus.template.missing.osin') == '' or getValue('visus.template.ou') ~= '' )
+ if ( getValue('visus.template.mangler.odxt') == '' or getValue('visus.template.mangler.osin') == '' or getValue('visus.template.ou') ~= '' )
then
out = out .. 'Visus template:\n'
end
- if ( getValue('visus.template.missing.odxt') == '' )
+ if ( getValue('visus.template.mangler.odxt') == '' )
then
out = out .. 'o.dxt: '
if ( getValue('visus.template.snellen.odxt') ~= '' )
@@ -79,7 +79,7 @@
- if ( getValue('visus.template.missing.osin') == '' )
+ if ( getValue('visus.template.mangler.osin') == '' )
then
out = out .. 'o.sin: '
if ( getValue('visus.template.snellen.osin') ~= '' )
@@ -167,46 +167,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
@@ -418,8 +418,8 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="visus.template.missing.odxt" script="right_eye"
- map="missing_eye_right_map"
+ name="visus.template.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">
@@ -767,8 +767,8 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="visus.template.missing.osin" script="left_eye"
- map="missing_eye_left_map"
+ name="visus.template.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">
diff --git a/server/xml/macros/visus-uden_korr-1.0.xml b/server/xml/macros/visus-uden_korr-1.0.xml
index 5caf5e9..05d0d39 100644
--- a/server/xml/macros/visus-uden_korr-1.0.xml
+++ b/server/xml/macros/visus-uden_korr-1.0.xml
@@ -11,12 +11,12 @@
-->
<resume language="lua">
out = ''
- if ( getValue('visus.uden_korr.missing.odxt') == '' or getValue('visus.uden_korr.missing.osin') == '' or getValue('visus.uden_korr.ou') ~= '' )
+ if ( getValue('visus.uden_korr.mangler.odxt') == '' or getValue('visus.uden_korr.mangler.osin') == '' or getValue('visus.uden_korr.ou') ~= '' )
then
out = out .. 'Visus uden korrektion:\n'
end
- if ( getValue('visus.uden_korr.missing.odxt') == '' )
+ if ( getValue('visus.uden_korr.mangler.odxt') == '' )
then
out = out .. 'o.dxt: '
if ( getValue('visus.uden_korr.snellen.odxt') ~= '' )
@@ -59,7 +59,7 @@
- if ( getValue('visus.uden_korr.missing.osin') == '' )
+ if ( getValue('visus.uden_korr.mangler.osin') == '' )
then
out = out .. 'o.sin: '
if ( getValue('visus.uden_korr.snellen.osin') ~= '' )
@@ -127,46 +127,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
@@ -378,8 +378,8 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="visus.uden_korr.missing.odxt" script="right_eye"
- map="missing_eye_right_map"
+ name="visus.uden_korr.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">
@@ -687,8 +687,8 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="visus.uden_korr.missing.osin" script="left_eye"
- map="missing_eye_left_map"
+ name="visus.uden_korr.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">
diff --git a/server/xml/macros/yderligere_diagnostik-1.0.xml b/server/xml/macros/yderligere_diagnostik-1.0.xml
index a513c53..dc6c3c7 100644
--- a/server/xml/macros/yderligere_diagnostik-1.0.xml
+++ b/server/xml/macros/yderligere_diagnostik-1.0.xml
@@ -4,8 +4,8 @@
Feltnavnene ændret så de giver mening.
-->
<macro name="yderligere_diagnostik" version="1.0">
- <resume>${amd_preop.konklusion. ${amd_preop.konklusion.eye}
-${amd_preop.konklusion.additional}${amd_preop.konklusion.terminated}.</resume>
+ <resume>${amd_preop.konklusion. ${amd_preop.konklusion.oeje}
+${amd_preop.konklusion.yderligere}${amd_preop.konklusion.terminated}.</resume>
<queries>
</queries>
<maps>
@@ -25,7 +25,7 @@ ${amd_preop.konklusion.additional}${amd_preop.konklusion.terminated}.</resume>
<frame layout="vbox">
<frame layout="hbox">
<label caption="Øje:" width="50"/>
- <radiobuttons name="amd_preop.konklusion.eye" value="">
+ <radiobuttons name="amd_preop.konklusion.oeje" value="">
<radiobutton caption="o.dxt" value="o.dxt"/>
<radiobutton caption="o.sin" value="o.sin"/>
</radiobuttons>
@@ -43,7 +43,7 @@ ${amd_preop.konklusion.additional}${amd_preop.konklusion.terminated}.</resume>
</combobox>
</frame>
<label caption="Supplerende:"/>
- <textedit name="amd_preop.konklusion.additional" value=""/>
+ <textedit name="amd_preop.konklusion.yderligere" value=""/>
<checkbox caption="Afsluttes" name="amd_preop.konklusion.terminated"
truevalue=" - Afsluttes" falsevalue="" value=""/>
</frame>