summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/xml/macros/autorefraktion-1.0.xml20
-rw-r--r--server/xml/macros/cycloplegisk_refraktion-1.0.xml8
-rw-r--r--server/xml/macros/example.xml16
-rw-r--r--server/xml/macros/fluorescens_konklusion-1.0.xml26
-rw-r--r--server/xml/macros/manifest_refraktion-1.0.xml8
-rw-r--r--server/xml/macros/visus-1.0.xml36
-rw-r--r--server/xml/macros/yderligere_diagnostik-1.0.xml14
7 files changed, 64 insertions, 64 deletions
diff --git a/server/xml/macros/autorefraktion-1.0.xml b/server/xml/macros/autorefraktion-1.0.xml
index 0e6e372..f5c1b3f 100644
--- a/server/xml/macros/autorefraktion-1.0.xml
+++ b/server/xml/macros/autorefraktion-1.0.xml
@@ -4,14 +4,14 @@
out = ''
if ( getValue('autorefractor.odxt.missing') == '' )
then
- out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefractor.odxt.sphere') .. ' sf'
+ out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefractor.odxt.sfere') .. ' sf'
if ( getValue('autorefractor.odxt.cyl') ~= '' )
then
out = out .. ', ' .. getValue('autorefractor.odxt.cyl') .. ' cyl'
end
- if ( getValue('autorefractor.odxt.axis') ~= '' )
+ if ( getValue('autorefractor.odxt.grader') ~= '' )
then
- out = out .. ', ' .. getValue('autorefractor.odxt.axis') .. ' grader\n'
+ out = out .. ', ' .. getValue('autorefractor.odxt.grader') .. ' grader\n'
else
out = out .. '\n'
end
@@ -19,14 +19,14 @@
if ( getValue('autorefractor.osin.missing') == '' )
then
- out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefractor.osin.sphere') .. ' sf'
+ out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefractor.osin.sfere') .. ' sf'
if ( getValue('autorefractor.osin.cyl') ~= '' )
then
out = out .. ', ' .. getValue('autorefractor.osin.cyl') .. ' cyl'
end
- if ( getValue('autorefractor.osin.axis') ~= '' )
+ if ( getValue('autorefractor.osin.grader') ~= '' )
then
- out = out .. ', ' .. getValue('autorefractor.osin.axis') .. ' grader\n'
+ out = out .. ', ' .. getValue('autorefractor.osin.grader') .. ' grader\n'
else
out = out .. '\n'
end
@@ -157,7 +157,7 @@
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="autorefractor.odxt.sphere"
+ <lineedit name="autorefractor.odxt.sfere"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
@@ -167,7 +167,7 @@
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="autorefractor.odxt.axis"
+ <lineedit name="autorefractor.odxt.grader"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
@@ -184,7 +184,7 @@
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="autorefractor.osin.sphere"
+ <lineedit name="autorefractor.osin.sfere"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
@@ -194,7 +194,7 @@
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="autorefractor.osin.axis"
+ <lineedit name="autorefractor.osin.grader"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
diff --git a/server/xml/macros/cycloplegisk_refraktion-1.0.xml b/server/xml/macros/cycloplegisk_refraktion-1.0.xml
index e82bd46..5653b88 100644
--- a/server/xml/macros/cycloplegisk_refraktion-1.0.xml
+++ b/server/xml/macros/cycloplegisk_refraktion-1.0.xml
@@ -154,7 +154,7 @@
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="cycloplegisk_refraktion.odxt.sf" map="cycloplegisk_refraktion.odxt.sphere"
+ <lineedit name="cycloplegisk_refraktion.odxt.sf" map="cycloplegisk_refraktion.odxt.sfere"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
@@ -164,7 +164,7 @@
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="cycloplegisk_refraktion.odxt.grader" map="cycloplegisk_refraktion.odxt.axis"
+ <lineedit name="cycloplegisk_refraktion.odxt.grader" map="cycloplegisk_refraktion.odxt.grader"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
@@ -180,7 +180,7 @@
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="cycloplegisk_refraktion.osin.sf" map="cycloplegisk_refraktion.osin.sphere"
+ <lineedit name="cycloplegisk_refraktion.osin.sf" map="cycloplegisk_refraktion.osin.sfere"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
@@ -190,7 +190,7 @@
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="cycloplegisk_refraktion.osin.grader" map="cycloplegisk_refraktion.osin.axis"
+ <lineedit name="cycloplegisk_refraktion.osin.grader" map="cycloplegisk_refraktion.osin.grader"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
diff --git a/server/xml/macros/example.xml b/server/xml/macros/example.xml
index 2e60ae7..d9710ec 100644
--- a/server/xml/macros/example.xml
+++ b/server/xml/macros/example.xml
@@ -1,10 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
-<macro name="example" version="1.0" resume="Axis: ${axis}\nCylinder: ${cyl}\nSphere: ${sphere}\n">
+<macro name="example" version="1.0" resume="Axis: $.grader}\nCylinder: ${cyl}\nSphere: $.sfere}\n">
<queries>
<query class="lensmeter" ttl="10000" automap="true"/>
</queries>
<maps>
- <map name="axis">
+ <map name=.grader">
-- LUA program
return math.pi, 1234567890, 'local'
</map>
@@ -30,9 +30,9 @@
</maps>
<scripts>
<script language="lua" name="theanswer">
- sphere = tonumber(getValue('sphere'))
- axis = tonumber(getValue('axis'))
- if( sphere == axis )
+ .sfere = tonumber(getValue(.sfere'))
+ .grader = tonumber(getValue(.grader'))
+ if(.sfere ==.grader )
then
setValue('cyl', name)
return true
@@ -50,7 +50,7 @@
<frame name="linse_framea" layout="hbox">
<icon src="righteye"/>
<label name="a" width="100" caption="Akse rotation:"/>
- <lineedit name="axis" regexp="[24]*" map="axis" lua="theanswer" value="244"/>
+ <lineedit name=.grader" regexp="[24]*" map=.grader" lua="theanswer" value="244"/>
</frame>
<frame name="linse_frameb" layout="hbox">
<icon src="lefteye"/>
@@ -62,10 +62,10 @@
</frame>
</frame>
<frame name="linse_frame" caption="FlereLinser:" layout="vbox">
- <multilist name="multilisttest" value="" layout="vbox" format="Sphere: ${spherecombo}, Cyl: ${multcyl}.">
+ <multilist name="multilisttest" value="" layout="vbox" format="Sphere: $.sferecombo}, Cyl: ${multcyl}.">
<frame name="linse_frameb" layout="hbox">
<label name="b" width="100" caption="Sphere:"/>
- <combobox name="spherecombo" width="100" value="val_lad" type="search">
+ <combobox name=.sferecombo" width="100" value="val_lad" type="search">
<item caption="sap" value="val_sap"/>
<item caption="sat" value="val_sat"/>
<item caption="sad" value="val_sad"/>
diff --git a/server/xml/macros/fluorescens_konklusion-1.0.xml b/server/xml/macros/fluorescens_konklusion-1.0.xml
index bfa115d..635f43e 100644
--- a/server/xml/macros/fluorescens_konklusion-1.0.xml
+++ b/server/xml/macros/fluorescens_konklusion-1.0.xml
@@ -16,20 +16,20 @@
<resume language="lua">
out = 'Konklusion:\n'
- if( getValue('fluorescens.conclusion') == 'Klassisk subretinal neovaskulær membran.'
- or getValue('fluorescens.conclusion') == 'Overvejende klassisk subretinal neovaskulær membran.' )
+ if( getValue('fluorescens.konklusion.) == 'Klassisk subretinal neovaskulær membran.'
+ or getValue('fluorescens.konklusion.) == 'Overvejende klassisk subretinal neovaskulær membran.' )
then
- out = out .. getValue('fluorescens.conclusion') .. '\n'
+ out = out .. getValue('fluorescens.konklusion.) .. '\n'
out = out .. 'Membranen er beliggende:'
.. getValue('fluorescens.membrane.position') .. '\n'
out = out .. 'Membranstørrelse:'
.. getValue('fluorescens.membrane.size') .. 'µm\n'
else
- if( getValue('fluorescens.conclusion') == 'andet' )
+ if( getValue('fluorescens.konklusion.) == 'andet' )
then
- out = out .. getValue('fluorescens.conclusion.other') .. '\n'
+ out = out .. getValue('fluorescens.konklusion.other') .. '\n'
else
- out = out .. getValue('fluorescens.conclusion') .. '\n'
+ out = out .. getValue('fluorescens.konklusion.) .. '\n'
end
end
@@ -41,17 +41,17 @@
</maps>
<scripts>
<script language="lua" name="angiografi_konklusion">
- -- This script sets the value of additional according to conclusion.
+ -- This script sets the value of additional according to.konklusion.
- if( getValue('fluorescens.conclusion') == 'Klassisk subretinal neovaskulær membran.'
- or getValue('fluorescens.conclusion') == 'Overvejende klassisk subretinal neovaskulær membran.' )
+ if( getValue('fluorescens.konklusion.) == 'Klassisk subretinal neovaskulær membran.'
+ or getValue('fluorescens.konklusion.) == 'Overvejende klassisk subretinal neovaskulær membran.' )
then
enable('yderligere_info_frame')
else
disable('yderligere_info_frame')
end
- if( getValue('fluorescens.conclusion') == 'andet' )
+ if( getValue('fluorescens.konklusion.) == 'andet' )
then
enable('andet_frame')
else
@@ -66,14 +66,14 @@
<frame layout="hbox">
<label caption="Øje:" width="50"/>
- <radiobuttons name="fluorescens.conclusion.eye" value="">
+ <radiobuttons name="fluorescens.konklusion.eye" value="">
<radiobutton caption="o.dxt" value="o.dxt"/>
<radiobutton caption="o.sin" value="o.sin"/>
</radiobuttons>
<spacer/>
</frame>
- <combobox name="fluorescens.conclusion"
+ <combobox name="fluorescens.konklusion"
value="Atrofiske foranderinger. Der findes ingen behandlingsindikation."
script="angiografi_konklusion">
<item caption="Atrofiske foranderinger. Der findes ingen behandlingsindikation"
@@ -94,7 +94,7 @@
<frame name="andet_frame" layout="hbox">
<label caption="Andet:"/>
- <lineedit name="fluorescens.conclusion.other" value=""/>
+ <lineedit name="fluorescens.konklusion.other" value=""/>
</frame>
<frame name="yderligere_info_frame" layout="vbox">
diff --git a/server/xml/macros/manifest_refraktion-1.0.xml b/server/xml/macros/manifest_refraktion-1.0.xml
index 7e64c1a..aad11dd 100644
--- a/server/xml/macros/manifest_refraktion-1.0.xml
+++ b/server/xml/macros/manifest_refraktion-1.0.xml
@@ -162,7 +162,7 @@
<frame layout="hbox">
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="manifest_refraktion.odxt.sf" map="manifest_refraktion.odxt.sphere"
+ <lineedit name="manifest_refraktion.odxt.sf" map="manifest_refraktion.odxt.sfere"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
@@ -172,7 +172,7 @@
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="manifest_refraktion.odxt.grader" map="manifest_refraktion.odxt.axis"
+ <lineedit name="manifest_refraktion.odxt.grader" map="manifest_refraktion.odxt.grader"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
@@ -190,7 +190,7 @@
<frame layout="hbox">
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="manifest_refraktion.osin.sf" map="manifest_refraktion.osin.sphere"
+ <lineedit name="manifest_refraktion.osin.sf" map="manifest_refraktion.osin.sfere"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
@@ -200,7 +200,7 @@
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="manifest_refraktion.osin.grader" map="manifest_refraktion.osin.axis"
+ <lineedit name="manifest_refraktion.osin.grader" map="manifest_refraktion.osin.grader"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
diff --git a/server/xml/macros/visus-1.0.xml b/server/xml/macros/visus-1.0.xml
index 68a2453..4aad946 100644
--- a/server/xml/macros/visus-1.0.xml
+++ b/server/xml/macros/visus-1.0.xml
@@ -26,30 +26,30 @@
then
out = out .. 'Visus o.dxt. ' .. getValue('snellen.odxt') .. '\n'
out = out .. 'ETDRS o.dxt. ' .. getValue('etdrs.odxt') .. '\n'
- if ( getValue('snellen.odxt.corr.basis') ~= 'Ingen' )
+ if ( getValue('snellen.odxt.korr.basis') ~= 'Ingen' )
then
- out = out .. 'Korr.: ' .. getValue('snellen.odxt.corr.basis') .. ' add '
+ out = out .. 'Korr.: ' .. getValue('snellen.odxt.korr.basis') .. ' add '
else
out = out .. 'Korr.: add '
end
- out = out .. getValue('snellen.odxt.corr.sph') .. ' sf, '
- .. getValue('snellen.odxt.corr.cyl') .. ' sph '
- .. getValue('snellen.odxt.corr.axis') .. ' grader.\n'
+ out = out .. getValue('snellen.odxt.korr.sf') .. ' sf, '
+ .. getValue('snellen.odxt.korr.cyl') .. '.sf '
+ .. getValue('snellen.odxt.korr.grader') .. ' grader.\n'
end
if ( getValue('snellen.osin.missing') == '' )
then
out = out .. 'Visus o.sin. ' .. getValue('snellen.osin') .. '\n'
out = out .. 'ETDRS o.sin. ' .. getValue('etdrs.osin') .. '\n'
- if ( getValue('snellen.osin.corr.basis') ~= 'Ingen' )
+ if ( getValue('snellen.osin.korr.basis') ~= 'Ingen' )
then
- out = out .. 'Korr.: ' .. getValue('snellen.osin.corr.basis') .. ' add '
+ out = out .. 'Korr.: ' .. getValue('snellen.osin.korr.basis') .. ' add '
else
out = out .. 'Korr.: add '
end
- out = out .. getValue('snellen.osin.corr.sph') .. ' sf, '
- .. getValue('snellen.osin.corr.cyl') .. ' sph '
- .. getValue('snellen.osin.corr.axis') .. ' grader.\n'
+ out = out .. getValue('snellen.osin.korr.sf') .. ' sf, '
+ .. getValue('snellen.osin.korr.cyl') .. '.sf '
+ .. getValue('snellen.osin.korr.grader') .. ' grader.\n'
end
end
return out
@@ -337,7 +337,7 @@
</frame>
<frame layout="vbox">
<label caption="Basis:"/>
- <combobox name="snellen.odxt.corr.basis" value="">
+ <combobox name="snellen.odxt.korr.basis" 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.corr.sph" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ <lineedit name="snellen.odxt.korr.sf" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="snellen.odxt.corr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ <lineedit name="snellen.odxt.korr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="snellen.odxt.corr.axis" regexp="[\d]+" script="lt359gt0" value=""/>
+ <lineedit name="snellen.odxt.korr.grader" regexp="[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>
@@ -526,7 +526,7 @@
</frame>
<frame layout="vbox">
<label caption="Basis:"/>
- <combobox name="snellen.osin.corr.basis" value="">
+ <combobox name="snellen.osin.korr.basis" 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.corr.sph" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ <lineedit name="snellen.osin.korr.sf" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="snellen.osin.corr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ <lineedit name="snellen.osin.korr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="snellen.osin.corr.axis" regexp="[\d]+" script="lt359gt0" value=""/>
+ <lineedit name="snellen.osin.korr.grader" regexp="[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>
diff --git a/server/xml/macros/yderligere_diagnostik-1.0.xml b/server/xml/macros/yderligere_diagnostik-1.0.xml
index aa57032..a513c53 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.conclusion} ${amd_preop.conclusion.eye}
-${amd_preop.conclusion_additional}${amd_preop.conclusion_terminated}.</resume>
+ <resume>${amd_preop.konklusion. ${amd_preop.konklusion.eye}
+${amd_preop.konklusion.additional}${amd_preop.konklusion.terminated}.</resume>
<queries>
</queries>
<maps>
@@ -14,7 +14,7 @@ ${amd_preop.conclusion_additional}${amd_preop.conclusion_terminated}.</resume>
<script language="lua" name="afsluttes">
if value == 'Der findes ingen indikation for yderligere udredning af AMD.'
then
- setValue('amd_preop.conclusion_terminated', ' - Afsluttes')
+ setValue('amd_preop.konklusion.terminated', ' - Afsluttes')
end
return true
</script>
@@ -25,7 +25,7 @@ ${amd_preop.conclusion_additional}${amd_preop.conclusion_terminated}.</resume>
<frame layout="vbox">
<frame layout="hbox">
<label caption="Øje:" width="50"/>
- <radiobuttons name="amd_preop.conclusion.eye" value="">
+ <radiobuttons name="amd_preop.konklusion.eye" value="">
<radiobutton caption="o.dxt" value="o.dxt"/>
<radiobutton caption="o.sin" value="o.sin"/>
</radiobuttons>
@@ -33,7 +33,7 @@ ${amd_preop.conclusion_additional}${amd_preop.conclusion_terminated}.</resume>
</frame>
<frame layout="hbox">
- <combobox name="amd_preop.conclusion"
+ <combobox name="amd_preop.konklusion"
value=""
script="afsluttes">
<item caption="Ingen indikation for yderligere udredning af AMD."
@@ -43,8 +43,8 @@ ${amd_preop.conclusion_additional}${amd_preop.conclusion_terminated}.</resume>
</combobox>
</frame>
<label caption="Supplerende:"/>
- <textedit name="amd_preop.conclusion_additional" value=""/>
- <checkbox caption="Afsluttes" name="amd_preop.conclusion_terminated"
+ <textedit name="amd_preop.konklusion.additional" value=""/>
+ <checkbox caption="Afsluttes" name="amd_preop.konklusion.terminated"
truevalue=" - Afsluttes" falsevalue="" value=""/>
</frame>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 06:08:50 +0000