summaryrefslogtreecommitdiff
path: root/server/xml/macros
diff options
context:
space:
mode:
Diffstat (limited to 'server/xml/macros')
-rw-r--r--server/xml/macros/cycloplegisk_refraktion-1.0.xml110
-rw-r--r--server/xml/macros/egen_brille-1.0.xml2
-rw-r--r--server/xml/macros/manifest_refraktion-1.0.xml110
-rw-r--r--server/xml/macros/ref-spaltelampe-1.0.xml215
-rw-r--r--server/xml/macros/ref_90d_linse-1.0.xml2
-rw-r--r--server/xml/macros/ref_aktuelle-1.0.xml3
-rw-r--r--server/xml/macros/ref_behandling-kirurgisk_procedure-1.0.xml250
-rw-r--r--server/xml/macros/ref_efterkontrol-overskrift-1.0.xml1
-rw-r--r--server/xml/macros/ref_foerstedagskontol-overskrift-1.0.xml1
-rw-r--r--server/xml/macros/ref_forunders-konklusion-1.0.xml1
-rw-r--r--server/xml/macros/test_metawidget.xml4
-rw-r--r--server/xml/macros/visus-autoref-1.0.xml4
-rw-r--r--server/xml/macros/visus-egen_korr-1.0.xml10
-rw-r--r--server/xml/macros/visus-manifest_refraktion-1.0.xml24
-rw-r--r--server/xml/macros/visus-ou-1.0.xml2
-rw-r--r--server/xml/macros/visus-template-1.0.xml16
-rw-r--r--server/xml/macros/visus-uden_korr-1.0.xml10
17 files changed, 130 insertions, 635 deletions
diff --git a/server/xml/macros/cycloplegisk_refraktion-1.0.xml b/server/xml/macros/cycloplegisk_refraktion-1.0.xml
index 7c66cf3..cdef363 100644
--- a/server/xml/macros/cycloplegisk_refraktion-1.0.xml
+++ b/server/xml/macros/cycloplegisk_refraktion-1.0.xml
@@ -35,7 +35,7 @@
return out
</resume>
<queries>
- <query service="pentominos" class="visutron900plus" ttl="100000"/>
+ <query class="cycloplegisk_refraktion" ttl="100000"/>
<query service="pracro" class="missing_eye_odxt" ttl="1000000"/>
<query service="pracro" class="missing_eye_osin" ttl="1000000"/>
</queries>
@@ -76,102 +76,6 @@
end
return value, timestamp, source
</map>
- <map name="visutron900plus.osin.sph_near">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(visutron900plus and visutron900plus.osin and visutron900plus.osin.sph_near and visutron900plus.osin.sph_near.value and visutron900plus.osin.sph_near.timestamp)
- then
- value = visutron900plus.osin.sph_near.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = visutron900plus.osin.sph_near.timestamp
- source = visutron900plus.osin.sph_near.source
- end
- return value, timestamp, source
- </map>
- <map name="visutron900plus.osin.cyl">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(visutron900plus and visutron900plus.osin and visutron900plus.osin.cyl and visutron900plus.osin.cyl.value and visutron900plus.osin.cyl.timestamp)
- then
- value = visutron900plus.osin.cyl.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = visutron900plus.osin.cyl.timestamp
- source = visutron900plus.osin.cyl.source
- end
- return value, timestamp, source
- </map>
- <map name="visutron900plus.osin.axis">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(visutron900plus and visutron900plus.osin and visutron900plus.osin.axis and visutron900plus.osin.axis.value and visutron900plus.osin.axis.timestamp)
- then
- value = visutron900plus.osin.axis.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = visutron900plus.osin.axis.timestamp
- source = visutron900plus.osin.axis.source
- end
- return value, timestamp, source
- </map>
- <map name="visutron900plus.odxt.sph_near">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(visutron900plus and visutron900plus.odxt and visutron900plus.odxt.sph_near and visutron900plus.odxt.sph_near.value and visutron900plus.odxt.sph_near.timestamp)
- then
- value = visutron900plus.odxt.sph_near.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = visutron900plus.odxt.sph_near.timestamp
- source = visutron900plus.odxt.sph_near.source
- end
- return value, timestamp, source
- </map>
- <map name="visutron900plus.odxt.cyl">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(visutron900plus and visutron900plus.odxt and visutron900plus.odxt.cyl and visutron900plus.odxt.cyl.value and visutron900plus.odxt.cyl.timestamp)
- then
- value = visutron900plus.odxt.cyl.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = visutron900plus.odxt.cyl.timestamp
- source = visutron900plus.odxt.cyl.source
- end
- return value, timestamp, source
- </map>
- <map name="visutron900plus.odxt.axis">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(visutron900plus and visutron900plus.odxt and visutron900plus.odxt.axis and visutron900plus.odxt.axis.value and visutron900plus.odxt.axis.timestamp)
- then
- value = visutron900plus.odxt.axis.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = visutron900plus.odxt.axis.timestamp
- source = visutron900plus.odxt.axis.source
- end
- return value, timestamp, source
- </map>
</maps>
<scripts>
<script language="lua" name="lt20gt-25">
@@ -250,17 +154,17 @@
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="cycloplegisk_refraktion.sf.odxt" map="visutron900plus.odxt.sph_near"
+ <lineedit name="cycloplegisk_refraktion.sf.odxt" map="cycloplegisk_refraktion.sf.odxt"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="cycloplegisk_refraktion.cyl.odxt" map="visutron900plus.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.grader.odxt" map="visutron900plus.odxt.axis"
+ <lineedit name="cycloplegisk_refraktion.grader.odxt" map="cycloplegisk_refraktion.grader.odxt"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
@@ -276,17 +180,17 @@
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="cycloplegisk_refraktion.sf.osin" map="visutron900plus.osin.sph_near"
+ <lineedit name="cycloplegisk_refraktion.sf.osin" map="cycloplegisk_refraktion.sf.osin"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="cycloplegisk_refraktion.cyl.osin" map="visutron900plus.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.grader.osin" map="visutron900plus.osin.axis"
+ <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 89cfef2..14df7db 100644
--- a/server/xml/macros/egen_brille-1.0.xml
+++ b/server/xml/macros/egen_brille-1.0.xml
@@ -35,7 +35,7 @@
return out
</resume>
<queries>
-<!-- <query service="pentominos" class="lensmeter" ttl="100000"/> -->
+ <query class="lensmeter" ttl="100000"/>
<query service="pracro" class="missing_eye_odxt" ttl="1000000"/>
<query service="pracro" class="missing_eye_osin" ttl="1000000"/>
</queries>
diff --git a/server/xml/macros/manifest_refraktion-1.0.xml b/server/xml/macros/manifest_refraktion-1.0.xml
index f057435..46b6f35 100644
--- a/server/xml/macros/manifest_refraktion-1.0.xml
+++ b/server/xml/macros/manifest_refraktion-1.0.xml
@@ -35,7 +35,7 @@
return out
</resume>
<queries>
- <query service="pentominos" class="phoroptor" ttl="100000"/>
+ <query class="manifest_refraktion" ttl="100000"/>
<query service="pracro" class="missing_eye_odxt" ttl="1000000"/>
<query service="pracro" class="missing_eye_osin" ttl="1000000"/>
</queries>
@@ -76,102 +76,6 @@
end
return value, timestamp, source
</map>
- <map name="phoroptor.osin.sph">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(phoroptor and phoroptor.osin and phoroptor.osin.sph and phoroptor.osin.sph.value and phoroptor.osin.sph.timestamp)
- then
- value = phoroptor.osin.sph.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = phoroptor.osin.sph.timestamp
- source = phoroptor.osin.sph.source
- end
- return value, timestamp, source
- </map>
- <map name="phoroptor.osin.cyl">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(phoroptor and phoroptor.osin and phoroptor.osin.cyl and phoroptor.osin.cyl.value and phoroptor.osin.cyl.timestamp)
- then
- value = phoroptor.osin.cyl.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = phoroptor.osin.cyl.timestamp
- source = phoroptor.osin.cyl.source
- end
- return value, timestamp, source
- </map>
- <map name="phoroptor.osin.axis">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(phoroptor and phoroptor.osin and phoroptor.osin.axis and phoroptor.osin.axis.value and phoroptor.osin.axis.timestamp)
- then
- value = phoroptor.osin.axis.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = phoroptor.osin.axis.timestamp
- source = phoroptor.osin.axis.source
- end
- return value, timestamp, source
- </map>
- <map name="phoroptor.odxt.sph">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(phoroptor and phoroptor.odxt and phoroptor.odxt.sph and phoroptor.odxt.sph.value and phoroptor.odxt.sph.timestamp)
- then
- value = phoroptor.odxt.sph.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = phoroptor.odxt.sph.timestamp
- source = phoroptor.odxt.sph.source
- end
- return value, timestamp, source
- </map>
- <map name="phoroptor.odxt.cyl">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(phoroptor and phoroptor.odxt and phoroptor.odxt.cyl and phoroptor.odxt.cyl.value and phoroptor.odxt.cyl.timestamp)
- then
- value = phoroptor.odxt.cyl.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = phoroptor.odxt.cyl.timestamp
- source = phoroptor.odxt.cyl.source
- end
- return value, timestamp, source
- </map>
- <map name="phoroptor.odxt.axis">
- -- Returning 0, 0 invalidates the result
- value = 0
- timestamp = 0
- source = 0
-
- if(phoroptor and phoroptor.odxt and phoroptor.odxt.axis and phoroptor.odxt.axis.value and phoroptor.odxt.axis.timestamp)
- then
- value = phoroptor.odxt.axis.value
- -- convert . to ,
- value = string.gsub(value, '[.]', ',')
- timestamp = phoroptor.odxt.axis.timestamp
- source = phoroptor.odxt.axis.source
- end
- return value, timestamp, source
- </map>
</maps>
<scripts>
<script language="lua" name="lt20gt-25">
@@ -258,17 +162,17 @@
<frame layout="hbox">
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="manifest_refraktion.sf.odxt" map="phoroptor.sph.odxt"
+ <lineedit name="manifest_refraktion.sf.odxt" map="manifest_refraktion.sf.odxt"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="manifest_refraktion.cyl.odxt" map="phoroptor.cyl.odxt"
+ <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.grader.odxt" map="phoroptor.axis.odxt"
+ <lineedit name="manifest_refraktion.grader.odxt" map="manifest_refraktion.grader.odxt"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
@@ -286,17 +190,17 @@
<frame layout="hbox">
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="manifest_refraktion.sf.osin" map="phoroptor.sph.osin"
+ <lineedit name="manifest_refraktion.sf.osin" map="manifest_refraktion.sf.osin"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="manifest_refraktion.cyl.osin" map="phoroptor.cyl.osin"
+ <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.grader.osin" map="phoroptor.axis.osin"
+ <lineedit name="manifest_refraktion.grader.osin" map="manifest_refraktion.grader.osin"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
diff --git a/server/xml/macros/ref-spaltelampe-1.0.xml b/server/xml/macros/ref-spaltelampe-1.0.xml
index c7ce659..95866fe 100644
--- a/server/xml/macros/ref-spaltelampe-1.0.xml
+++ b/server/xml/macros/ref-spaltelampe-1.0.xml
@@ -52,66 +52,10 @@
out = out .. getValue('spaltelampe.epitel.andet.odxt') .. '\n'
end
- if ( getValue('spaltelampe.stroma.klart.odxt') ~= '' or getValue('spaltelampe.stroma.karindvaekst.odxt') ~= '' or getValue('spaltelampe.stroma.makulering.odxt') ~= '' or getValue('spaltelampe.stroma.mdfolder.odxt') ~= '' or getValue('spaltelampe.stroma.andet.odxt') ~= '' or getValue('spaltelampe.stroma.haze.odxt') ~= '' )
- then
- out = out .. ' Stroma: '
- if ( getValue('spaltelampe.stroma.klart.odxt') ~= '' )
- then
- out = out .. getValue('spaltelampe.stroma.klart.odxt')
- if ( getValue('spaltelampe.stroma.karindvaekst.odxt') ~= '' or getValue('spaltelampe.stroma.makulering.odxt') ~= '' or getValue('spaltelampe.stroma.mdfolder.odxt') ~= '' or getValue('spaltelampe.stroma.andet.odxt') ~= '' or getValue('spaltelampe.stroma.haze.odxt') ~= '' )
- then
- out = out .. ', '
- else
- out = out .. '\n'
- end
- end
- if ( getValue('spaltelampe.stroma.karindvaekst.odxt') ~= '' )
- then
- out = out .. getValue('spaltelampe.stroma.karindvaekst.odxt')
- if ( getValue('spaltelampe.stroma.makulering.odxt') ~= '' or getValue('spaltelampe.stroma.mdfolder.odxt') ~= '' or getValue('spaltelampe.stroma.andet.odxt') ~= '' or getValue('spaltelampe.stroma.haze.odxt') ~= '' )
- then
- out = out .. ', '
- else
- out = out .. '\n'
- end
- end
- if ( getValue('spaltelampe.stroma.makulering.odxt') ~= '' )
- then
- out = out .. getValue('spaltelampe.stroma.makulering.odxt')
- if ( getValue('spaltelampe.stroma.mdfolder.odxt') ~= '' or getValue('spaltelampe.stroma.andet.odxt') ~= '' or getValue('spaltelampe.stroma.haze.odxt') ~= '' )
- then
- out = out .. ', '
- else
- out = out .. '\n'
- end
- end
- if ( getValue('spaltelampe.stroma.mdfolder.odxt') ~= '' )
- then
- out = out .. getValue('spaltelampe.stroma.mdfolder.odxt')
- if ( getValue('spaltelampe.stroma.andet.odxt') ~= '' or getValue('spaltelampe.stroma.haze.odxt') ~= '' )
- then
- out = out .. ', '
- else
- out = out .. '\n'
- end
- end
- if ( getValue('spaltelampe.stroma.haze.odxt') ~= '' )
- then
- out = out .. getValue('spaltelampe.stroma.haze.odxt')
- if ( getValue('spaltelampe.stroma.andet.odxt') ~= '' )
- then
- out = out .. ', '
- else
- out = out .. '\n'
- end
- end
- if ( getValue('spaltelampe.stroma.andet.odxt') ~= '' )
- then
- out = out .. getValue('spaltelampe.stroma.andet.odxt')
- out = out .. '\n'
- end
+ if ( getValue('spaltelampe.stroma.odxt') ~= '' )
+ then
+ out = out .. ' Stroma: ' .. getValue('spaltelampe.stroma.odxt') .. '\n'
end
-
if ( getValue('spaltelampe.flap.odxt') ~= '' )
then
out = out .. ' Flap: ' .. getValue('spaltelampe.flap.odxt') .. '\n'
@@ -210,67 +154,10 @@
then
out = out .. ' Epitel: ' .. getValue('spaltelampe.epitel.osin') .. '\n'
end
-
- if ( getValue('spaltelampe.stroma.klart.osin') ~= '' or getValue('spaltelampe.stroma.karindvaekst.osin') ~= '' or getValue('spaltelampe.stroma.makulering.osin') ~= '' or getValue('spaltelampe.stroma.mdfolder.osin') ~= '' or getValue('spaltelampe.stroma.andet.osin') ~= '' or getValue('spaltelampe.stroma.haze.osin') ~= '' )
- then
- out = out .. ' Stroma: '
- if ( getValue('spaltelampe.stroma.klart.osin') ~= '' )
- then
- out = out .. getValue('spaltelampe.stroma.klart.osin')
- if ( getValue('spaltelampe.stroma.karindvaekst.osin') ~= '' or getValue('spaltelampe.stroma.makulering.osin') ~= '' or getValue('spaltelampe.stroma.mdfolder.osin') ~= '' or getValue('spaltelampe.stroma.andet.osin') ~= '' or getValue('spaltelampe.stroma.haze.osin') ~= '' )
- then
- out = out .. ', '
- else
- out = out .. '\n'
- end
- end
- if ( getValue('spaltelampe.stroma.karindvaekst.osin') ~= '' )
- then
- out = out .. getValue('spaltelampe.stroma.karindvaekst.osin')
- if ( getValue('spaltelampe.stroma.makulering.osin') ~= '' or getValue('spaltelampe.stroma.mdfolder.osin') ~= '' or getValue('spaltelampe.stroma.andet.osin') ~= '' or getValue('spaltelampe.stroma.haze.osin') ~= '' )
- then
- out = out .. ', '
- else
- out = out .. '\n'
- end
- end
- if ( getValue('spaltelampe.stroma.makulering.osin') ~= '' )
- then
- out = out .. getValue('spaltelampe.stroma.makulering.osin')
- if ( getValue('spaltelampe.stroma.mdfolder.osin') ~= '' or getValue('spaltelampe.stroma.andet.osin') ~= '' or getValue('spaltelampe.stroma.haze.osin') ~= '' )
- then
- out = out .. ', '
- else
- out = out .. '\n'
- end
- end
- if ( getValue('spaltelampe.stroma.mdfolder.osin') ~= '' )
- then
- out = out .. getValue('spaltelampe.stroma.mdfolder.osin')
- if ( getValue('spaltelampe.stroma.andet.osin') ~= '' or getValue('spaltelampe.stroma.haze.osin') ~= '' )
- then
- out = out .. ', '
- else
- out = out .. '\n'
- end
- end
- if ( getValue('spaltelampe.stroma.haze.osin') ~= '' )
- then
- out = out .. getValue('spaltelampe.stroma.haze.osin')
- if ( getValue('spaltelampe.stroma.andet.osin') ~= '' )
- then
- out = out .. ', '
- else
- out = out .. '\n'
- end
- end
- if ( getValue('spaltelampe.stroma.andet.osin') ~= '' )
- then
- out = out .. getValue('spaltelampe.stroma.andet.osin')
- out = out .. '\n'
- end
+ if ( getValue('spaltelampe.stroma.osin') ~= '' )
+ then
+ out = out .. ' Stroma: ' .. getValue('spaltelampe.stroma.osin') .. '\n'
end
-
if ( getValue('spaltelampe.flap.osin') ~= '' )
then
out = out .. ' Flap: ' .. getValue('spaltelampe.flap.osin') .. '\n'
@@ -434,31 +321,24 @@
<frame layout="vbox">
<label caption="Stroma:"/>
<label/>
- <label/>
- <label/>
- <label/>
</frame>
<frame layout="vbox">
- <checkbox name="spaltelampe.stroma.klart.odxt" caption="Klart" falsevalue="" truevalue="Klart"/>
- <checkbox name="spaltelampe.stroma.karindvaekst.odxt" caption="Karindvækst" falsevalue="" truevalue="Karindvækst"/>
- <checkbox name="spaltelampe.stroma.makulering.odxt" caption="Makulering" falsevalue="" truevalue="Makulering"/>
- <checkbox name="spaltelampe.stroma.mdfolder.odxt" caption="MD-folder" falsevalue="" truevalue="MD-folder"/>
- <frame layout="hbox">
- <label caption="Haze:"/>
- <combobox name="spaltelampe.stroma.haze.odxt" layout="vbox" value="">
- <item caption="Ingen" value=""/>
- <item caption="Spor af haze - grad 0,5" value="Spor af haze - grad 0,5"/>
- <item caption="Let haze - grad 1" value="Let haze - grad 1"/>
- <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"/>
- </combobox>
- <spacer/>
- </frame>
- <frame layout="hbox">
- <label caption="Andet:"/>
- <lineedit name="spaltelampe.stroma.andet.odxt"/>
- </frame>
+ <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"/>
+ <item caption="Makulering" value="Makulering"/>
+ <item caption="MD-folder" value="MD-folder"/>
+ <item caption="Spor af haze - grad 0,5" value="Spor af haze - grad 0,5"/>
+ <item caption="Let haze - grad 1" value="Let haze - grad 1"/>
+ <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.stroma.andet.odxt">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.stroma.andet.odxt"/>
+ </altitem>
+ </altcombobox>
</frame>
</frame>
@@ -631,31 +511,24 @@
<frame layout="vbox">
<label caption="Stroma:"/>
<label/>
- <label/>
- <label/>
- <label/>
</frame>
<frame layout="vbox">
- <checkbox name="spaltelampe.stroma.klart.osin" caption="Klart" falsevalue="" truevalue="Klart"/>
- <checkbox name="spaltelampe.stroma.karindvaekst.osin" caption="Karindvækst" falsevalue="" truevalue="Karindvækst"/>
- <checkbox name="spaltelampe.stroma.makulering.osin" caption="Makulering" falsevalue="" truevalue="Makulering"/>
- <checkbox name="spaltelampe.stroma.mdfolder.osin" caption="MD-folder" falsevalue="" truevalue="MD-folder"/>
- <frame layout="hbox">
- <label caption="Haze:"/>
- <combobox name="spaltelampe.stroma.haze.osin" layout="vbox" value="">
- <item caption="Ingen" value=""/>
- <item caption="Spor af haze - grad 0,5" value="Spor af haze - grad 0,5"/>
- <item caption="Let haze - grad 1" value="Let haze - grad 1"/>
- <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"/>
- </combobox>
- <spacer/>
- </frame>
- <frame layout="hbox">
- <label caption="Andet:"/>
- <lineedit name="spaltelampe.stroma.andet.osin"/>
- </frame>
+ <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"/>
+ <item caption="Makulering" value="Makulering"/>
+ <item caption="MD-folder" value="MD-folder"/>
+ <item caption="Spor af haze - grad 0,5" value="Spor af haze - grad 0,5"/>
+ <item caption="Let haze - grad 1" value="Let haze - grad 1"/>
+ <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.stroma.andet.osin">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.stroma.andet.osin"/>
+ </altitem>
+ </altcombobox>
</frame>
</frame>
@@ -705,26 +578,26 @@
<label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.interface.partikler.osin" 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.interface.partikler.andet.osin">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.partikler.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.interface.partikler.andet.osin"/>
+ <lineedit name="spaltelampe.partikler.andet.osin"/>
</altitem>
</altcombobox>
- <altcombobox name="spaltelampe.interface.epitelindvaekst.osin" 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.interface.epitelindvaekst.andet.osin">
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.epitelindvaekst.andet.osin">
<label caption="Andet:"/>
- <lineedit name="spaltelampe.interface.epitelindvaekst.andet.osin"/>
+ <lineedit name="spaltelampe.epitelindvaekst.andet.osin"/>
</altitem>
</altcombobox>
</frame>
diff --git a/server/xml/macros/ref_90d_linse-1.0.xml b/server/xml/macros/ref_90d_linse-1.0.xml
index 5fb7cfb..059958b 100644
--- a/server/xml/macros/ref_90d_linse-1.0.xml
+++ b/server/xml/macros/ref_90d_linse-1.0.xml
@@ -215,7 +215,7 @@
</altcombobox>
<frame name="hul_eller_rift.frame.odxt" layout="hbox">
<label caption="Hul eller rift kl.:"/>
- <combobox name="90d_linse.hul_eller_rift_kl.odxt">
+ <combobox name="90_dlinse.hul_eller_rift_kl.odxt">
<item caption="1" value="1"/>
<item caption="2" value="2"/>
<item caption="3" value="3"/>
diff --git a/server/xml/macros/ref_aktuelle-1.0.xml b/server/xml/macros/ref_aktuelle-1.0.xml
index 8421ca1..2fc4d4f 100644
--- a/server/xml/macros/ref_aktuelle-1.0.xml
+++ b/server/xml/macros/ref_aktuelle-1.0.xml
@@ -22,8 +22,7 @@
<frame layout="vbox">
<label caption="Patienten benytter:"/>
<combobox name="ref_aktuelle.bruger_nu" layout="vbox">
- <item caption="Ingen korrektion" value="ingen korrektion"/>
- <item caption="Briller" value="briller"/>
+ <item caption="Briller" value="Briller"/>
<item caption="Hårde kontaktlinser" value="hårde kontaktlinser"/>
<item caption="Bløde kontaktlinser" value="bløde kontaktlinser"/>
<item caption="Både briller og kontaktlinser" value="både briller og kontaktlinser"/>
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 faa7355..a35e2c8 100644
--- a/server/xml/macros/ref_behandling-kirurgisk_procedure-1.0.xml
+++ b/server/xml/macros/ref_behandling-kirurgisk_procedure-1.0.xml
@@ -2,25 +2,19 @@
<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.oeje') .. ' øje.\n'
-
-
if ( getValue('ref_behandling.kirurgisk_procedure.type') == 'LASIK' )
then
out = out .. 'LASIK flappen skæres med ' .. getValue('ref_behandling.kirurgisk_procedure.lasik.metode') .. '.\n'
- if ( getValue('ref_behandling.kirurgisk_procedure.lasik.metode') == 'Moria M2 90 SU' or getValue('ref_behandling.kirurgisk_procedure.lasik.metode') == 'Moria M2 130' )
- then
- out = out .. ' Variabel sugekop: ' .. getValue('ref_behandling.kirurgisk_procedure.lasik.sugekop') .. '\n'
- out = out .. ' Variabel hængsel: ' .. getValue('ref_behandling.kirurgisk_procedure.lasik.haengsel') .. '\n'
- end
- if ( getValue('ref_behandling.kirurgisk_procedure.lasik.metode') == 'Visumax' )
+
+ if ( getValue('ref_behandling.kirurgisk_procedure.lasik.metode') == 'femtosekundlaser' )
then
- out = out .. ' Flapdiameter: ' .. getValue('ref_behandling.kirurgisk_procedure.lasik.flapdiameter') .. ' mm\n'
- out = out .. ' Flaptykkelse: ' .. getValue('ref_behandling.kirurgisk_procedure.lasik.flaptykkelse') .. ' um\n'
- out = out .. ' Kantprofil: ' .. getValue('ref_behandling.kirurgisk_procedure.lasik.kantprofil') .. '\n'
+ out = out .. 'Flapdiameter: ' .. getValue('ref_behandling.kirurgisk_procedure.lasik.flapdiameter') .. ' mm\n'
+ out = out .. 'Flaptykkelse: ' .. getValue('ref_behandling.kirurgisk_procedure.lasik.flaptykkelse') .. ' um\n'
+ out = out .. 'Kantprofil: ' .. getValue('ref_behandling.kirurgisk_procedure.lasik.kantprofil') .. '\n'
end
+
out = out .. 'Flappen løftes med flap-lifter.\n\n'
end
@@ -44,41 +38,11 @@
out = out .. getValue('ref_behandling.kirurgisk_procedure.lasek.part1') .. '\n\n'
end
- if ( getValue('ref_behandling.kirurgisk_procedure.type') == 'FLEX' )
- then
- out = out .. 'FLEX flappen skæres med ' .. getValue('ref_behandling.kirurgisk_procedure.flex.metode') .. '.\n'
-
- if ( getValue('ref_behandling.kirurgisk_procedure.flex.metode') == 'Moria M2 90 SU' or getValue('ref_behandling.kirurgisk_procedure.flex.metode') == 'Moria M2 130' )
- then
- out = out .. ' Variabel sugekop: ' .. getValue('ref_behandling.kirurgisk_procedure.flex.sugekop') .. '\n'
- out = out .. ' Variabel hængsel: ' .. getValue('ref_behandling.kirurgisk_procedure.flex.haengsel') .. '\n'
- end
-
- if ( getValue('ref_behandling.kirurgisk_procedure.flex.metode') == 'Visumax' )
- then
- out = out .. ' Flapdiameter: ' .. getValue('ref_behandling.kirurgisk_procedure.flex.flapdiameter') .. ' mm\n'
- out = out .. ' Flaptykkelse: ' .. getValue('ref_behandling.kirurgisk_procedure.flex.flaptykkelse') .. ' um\n'
- out = out .. ' Kantprofil: ' .. getValue('ref_behandling.kirurgisk_procedure.flex.kantprofil') .. '\n'
- end
-
- out = out .. 'Flappen løftes med flap-lifter.\n\n'
- end
-
-
-
- out = out .. 'Tilstræbt refraktionsændring:\n'
- out = out .. 'Algoritme: ' .. getValue('ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.algoritme') .. '\n'
- out = out .. 'Korrektion: ' .. getValue('ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.sf') .. ' sf ' .. getValue('ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.cyl') .. ' x ' .. getValue('ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.grader') .. '\n'
- out = out .. 'Behandlingsdiameter: ' .. getValue('ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.behandlingsdiameter') .. ' mm\n'
- out = out .. 'Behandlingsdybde: ' .. getValue('ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.behandlingsdybde') .. ' um\n'
- if ( getValue('ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.algoritme') == 'FLEX' )
- then
- out = out .. 'Kanttykkelse: ' .. getValue('ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.kanttykkelse') .. ' mym\n\n'
- else
- out = out .. '\n'
- end
-
-
+ out = out .. 'Fotoablation:\n'
+ out = out .. 'Algoritme: ' .. getValue('ref_behandling.kirurgisk_procedure.fotoablation.algoritme') .. '\n'
+ out = out .. 'Korrektion: ' .. getValue('ref_behandling.kirurgisk_procedure.fotoablation.sf') .. ' sf ' .. getValue('ref_behandling.kirurgisk_procedure.fotoablation.cyl') .. ' x ' .. getValue('ref_behandling.kirurgisk_procedure.fotoablation.grader') .. '\n'
+ out = out .. 'Ablationsdiameter: ' .. getValue('ref_behandling.kirurgisk_procedure.fotoablation.ablationsdiameter') .. ' mm\n'
+ out = out .. 'Ablationsdybde: ' .. getValue('ref_behandling.kirurgisk_procedure.fotoablation.ablationsdybde') .. ' um\n\n'
if ( getValue('ref_behandling.kirurgisk_procedure.type') == 'LASIK' )
then
@@ -105,17 +69,8 @@
out = out .. getValue('ref_behandling.kirurgisk_procedure.lasek.part2') .. '\n\n'
end
- if ( getValue('ref_behandling.kirurgisk_procedure.type') == 'FLEX' )
- then
- out = out .. getValue('ref_behandling.kirurgisk_procedure.flex.part2') .. '\n\n'
- end
-
-
-
out = out .. 'Der dryppes med ' .. getValue('ref_behandling.kirurgisk_procedure.drypperegime') .. '\n\n'
-
-
if ( getValue('ref_behandling.kirurgisk_procedure.komplikationer') ~= '' )
then
out = out .. 'Komplikationer: ' .. getValue('ref_behandling.kirurgisk_procedure.komplikationer')
@@ -135,12 +90,10 @@
disable('prk_frame1')
disable('relasik_frame1')
disable('lasek_frame1')
- disable('flex_frame1')
enable('lasik_frame2')
disable('prk_frame2')
disable('relasik_frame2')
disable('lasek_frame2')
- disable('flex_frame2')
end
if ( getValue('ref_behandling.kirurgisk_procedure.type') == 'PRK' )
then
@@ -148,12 +101,10 @@
enable('prk_frame1')
disable('relasik_frame1')
disable('lasek_frame1')
- disable('flex_frame1')
disable('lasik_frame2')
enable('prk_frame2')
disable('relasik_frame2')
disable('lasek_frame2')
- disable('flex_frame2')
end
if ( getValue('ref_behandling.kirurgisk_procedure.type') == 'reLASIK' )
then
@@ -161,12 +112,10 @@
disable('prk_frame1')
enable('relasik_frame1')
disable('lasek_frame1')
- disable('flex_frame1')
disable('lasik_frame2')
disable('prk_frame2')
enable('relasik_frame2')
disable('lasek_frame2')
- disable('flex_frame2')
end
if ( getValue('ref_behandling.kirurgisk_procedure.type') == 'rePRK' )
then
@@ -174,12 +123,10 @@
enable('prk_frame1')
disable('relasik_frame1')
disable('lasek_frame1')
- disable('flex_frame1')
disable('lasik_frame2')
enable('prk_frame2')
disable('relasik_frame2')
disable('lasek_frame2')
- disable('flex_frame2')
end
if ( getValue('ref_behandling.kirurgisk_procedure.type') == 'LASEK' )
then
@@ -187,60 +134,19 @@
disable('prk_frame1')
disable('relasik_frame1')
enable('lasek_frame1')
- disable('flex_frame1')
disable('lasik_frame2')
disable('prk_frame2')
disable('relasik_frame2')
enable('lasek_frame2')
- disable('flex_frame2')
- end
- if ( getValue('ref_behandling.kirurgisk_procedure.type') == 'FLEX' )
- then
- disable('lasik_frame1')
- disable('prk_frame1')
- disable('relasik_frame1')
- disable('lasek_frame1')
- enable('flex_frame1')
- disable('lasik_frame2')
- disable('prk_frame2')
- disable('relasik_frame2')
- disable('lasek_frame2')
- enable('flex_frame2')
- end
- return true
- </script>
- <script language="lua" name="lasik_metode_check">
- disable('lasik_visumax')
- disable('lasik_moria')
- if ( getValue('ref_behandling.kirurgisk_procedure.lasik.metode') == 'Visumax' )
- then
- enable('lasik_visumax')
- end
- if ( getValue('ref_behandling.kirurgisk_procedure.lasik.metode') == 'Moria M2 90 SU' or getValue('ref_behandling.kirurgisk_procedure.lasik.metode') == 'Moria M2 130' )
- then
- enable('lasik_moria')
end
return true
</script>
- <script language="lua" name="flex_metode_check">
- disable('flex_visumax')
- disable('flex_moria')
- if ( getValue('ref_behandling.kirurgisk_procedure.flex.metode') == 'Visumax' )
+ <script language="lua" name="femtosekundlaser_check">
+ if ( getValue('ref_behandling.kirurgisk_procedure.lasik.metode') == 'femtosekundlaser' )
then
- enable('flex_visumax')
- end
- if ( getValue('ref_behandling.kirurgisk_procedure.flex.metode') == 'Moria M2 90 SU' or getValue('ref_behandling.kirurgisk_procedure.flex.metode') == 'Moria M2 130' )
- then
- enable('flex_moria')
- end
- return true
- </script>
- <script language="lua" name="algoritme">
- if ( getValue('ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.algoritme') == 'FLEX' )
- then
- enable('flex_algoritme')
+ enable('femtosekundlaser')
else
- disable('flex_algoritme')
+ disable('femtosekundlaser')
end
return true
</script>
@@ -374,12 +280,11 @@
<item caption="reLASIK" value="reLASIK"/>
<item caption="rePRK" value="rePRK"/>
<item caption="LASEK" value="LASEK"/>
- <item caption="FLEX" value="FLEX"/>
</combobox>
<label caption="på"/>
<combobox name="ref_behandling.kirurgisk_procedure.oeje" value="">
- <item caption="Højre" value="højre"/>
- <item caption="Venstre" value="venstre"/>
+ <item caption="højre" value="højre"/>
+ <item caption="venstre" value="venstre"/>
</combobox>
<label caption="øje"/>
<spacer/>
@@ -392,41 +297,20 @@
<!-- LASIK frame -->
<frame name="lasik_frame1" caption="LASIK" layout="vbox">
<label caption="LASIK flappen skæres med:"/>
- <altcombobox name="ref_behandling.kirurgisk_procedure.lasik.metode" value="" layout="vbox" script="lasik_metode_check">
+ <altcombobox name="ref_behandling.kirurgisk_procedure.lasik.metode" value="" layout="vbox" script="femtosekundlaser_check">
<item caption="Ikke udfyldt" value=""/>
<item caption="Moria M2 90 SU" value="Moria M2 90 SU"/>
<item caption="Moria M2 130" value="Moria M2 130"/>
- <item caption="Visumax" value="Visumax"/>
+ <item caption="femtosekundlaser" value="femtosekundlaser"/>
<altitem caption="Andet" value="andet" innerwidget="lasik_andet" layout="hbox">
<label caption="Andet:"/>
- <lineedit name="lasik_andet"/>
+ <lineedit name="lasik_andet" regexp="[0-9]+(,\d+|\d*)"/>
</altitem>
</altcombobox>
- <frame name="lasik_moria" layout="vbox">
- <frame layout="hbox">
- <label caption="Variabel sugekop:"/>
- <combobox name="ref_behandling.kirurgisk_procedure.lasik.sugekop" value="" layout="vbox">
- <item caption="-1" value="-1"/>
- <item caption="0" value="0"/>
- <item caption="+1" value="+1"/>
- <item caption="+2" value="+2"/>
- </combobox>
- <spacer/>
- </frame>
- <frame layout="hbox">
- <label caption="Variabel hængsel:"/>
- <combobox name="ref_behandling.kirurgisk_procedure.lasik.haengsel" value="" layout="vbox">
- <item caption="7,5" value="7,5"/>
- <item caption="8,0" value="8,0"/>
- <item caption="8,5" value="8,5"/>
- </combobox>
- <spacer/>
- </frame>
- </frame>
- <frame name="lasik_visumax" layout="vbox">
+ <frame name="femtosekundlaser" layout="vbox">
<frame layout="hbox">
<label caption="Flapdiameter:"/>
- <lineedit name="ref_behandling.kirurgisk_procedure.lasik.flapdiameter" regexp="\d{1,2},\d{2}"/>
+ <lineedit name="ref_behandling.kirurgisk_procedure.lasik.flapdiameter" regexp="\d{1,2},\d{1}"/>
<label caption="mm"/>
<spacer/>
</frame>
@@ -438,7 +322,7 @@
</frame>
<frame layout="hbox">
<label caption="Kantprofil:"/>
- <lineedit name="ref_behandling.kirurgisk_procedure.lasik.kantprofil" regexp="\d{1,3}"/>
+ <lineedit name="ref_behandling.kirurgisk_procedure.lasik.kantprofil" regexp="\d{1,3},\d{1}"/>
<spacer/>
</frame>
</frame>
@@ -459,75 +343,18 @@
<checkbox name="ref_behandling.kirurgisk_procedure.lasek.part1" caption="Efter applikation af 20% alkohol i 20 sek løftes epithelet i de centrale 8 mm til side." truevalue="Efter applikation af 20% alkohol i 20 sek løftes epithelet i de centrale 8 mm til side." falsevalue=""/>
</frame>
- <!-- FLEX frame -->
- <frame name="flex_frame1" caption="FLEX" layout="vbox">
- <label caption="FLEX flappen skæres med:"/>
- <altcombobox name="ref_behandling.kirurgisk_procedure.flex.metode" value="" layout="vbox" script="flex_metode_check">
- <item caption="Ikke udfyldt" value=""/>
- <item caption="Moria M2 90 SU" value="Moria M2 90 SU"/>
- <item caption="Moria M2 130" value="Moria M2 130"/>
- <item caption="Visumax" value="Visumax"/>
- <altitem caption="Andet" value="andet" innerwidget="flex_andet" layout="hbox">
- <label caption="Andet:"/>
- <lineedit name="flex_andet"/>
- </altitem>
- </altcombobox>
- <frame name="flex_moria" layout="vbox">
- <frame layout="hbox">
- <label caption="Variabel sugekop:"/>
- <combobox name="ref_behandling.kirurgisk_procedure.flex.sugekop" value="" layout="vbox">
- <item caption="-1" value="-1"/>
- <item caption="0" value="0"/>
- <item caption="+1" value="+1"/>
- <item caption="+2" value="+2"/>
- </combobox>
- <spacer/>
- </frame>
- <frame layout="hbox">
- <label caption="Variabel hængsel:"/>
- <combobox name="ref_behandling.kirurgisk_procedure.flex.haengsel" value="" layout="vbox">
- <item caption="7,5" value="7,5"/>
- <item caption="8,0" value="8,0"/>
- <item caption="8,5" value="8,5"/>
- </combobox>
- <spacer/>
- </frame>
- </frame>
- <frame name="flex_visumax" layout="vbox">
- <frame layout="hbox">
- <label caption="Flapdiameter:"/>
- <lineedit name="ref_behandling.kirurgisk_procedure.flex.flapdiameter" regexp="\d{1,2},\d{2}"/>
- <label caption="mm"/>
- <spacer/>
- </frame>
- <frame layout="hbox">
- <label caption="Flaptykkelse:"/>
- <lineedit name="ref_behandling.kirurgisk_procedure.flex.flaptykkelse" regexp="\d{1,3}"/>
- <label caption="um"/>
- <spacer/>
- </frame>
- <frame layout="hbox">
- <label caption="Kantprofil:"/>
- <lineedit name="ref_behandling.kirurgisk_procedure.flex.kantprofil" regexp="\d{1,3}"/>
- <spacer/>
- </frame>
- </frame>
- </frame>
-
<!-- End 2nd outer frame -->
</frame>
- <!-- Tilstraebt refraktionsændring frame -->
- <frame name="tilstraebtrefrationsaendring_frame" caption="3. Tilstræbt refraktionsændring" layout="vbox">
+ <!-- Fotoablation frame -->
+ <frame name="fotoablation_frame" caption="3. Fotoablation" layout="vbox">
<frame layout="hbox">
<label caption="Algoritme:"/>
- <combobox name="ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.algoritme" script="algoritme">
+ <combobox name="ref_behandling.kirurgisk_procedure.fotoablation.algoritme">
<item caption="Smart" value="Smart"/>
<item caption="Tissue saving" value="Tissue saving"/>
<item caption="Topografistyret" value="Topografistyret"/>
- <item caption="Topografi 'smooth'" value="Topografi 'smooth'"/>
<item caption="Bølgefrontstyret" value="Bølgefrontstyret"/>
- <item caption="FLEX" value="FLEX"/>
</combobox>
<spacer/>
</frame>
@@ -538,35 +365,29 @@
</frame>
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.sf" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ <lineedit name="ref_behandling.kirurgisk_procedure.fotoablation.sf" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ <lineedit name="ref_behandling.kirurgisk_procedure.fotoablation.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.grader" regexp="[\d]+" script="lt179gt0" value=""/>
+ <lineedit name="ref_behandling.kirurgisk_procedure.fotoablation.grader" regexp="[\d]+" script="lt179gt0" value=""/>
</frame>
</frame>
<frame layout="hbox">
- <label caption="Behandlingsdiameter:"/>
- <lineedit name="ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.behandlingsdiameter" script="lt12gt0" regexp="\d{1,2},\d{2}"/>
+ <label caption="Ablationsdiameter:"/>
+ <lineedit name="ref_behandling.kirurgisk_procedure.fotoablation.ablationsdiameter" script="lt12gt0" regexp="\d{1,2},\d{1}"/>
<label caption="mm"/>
<spacer/>
</frame>
<frame layout="hbox">
- <label caption="Behandlingsdybde:"/>
- <lineedit name="ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.behandlingsdybde" script="lt500gt0" regexp="\d{1,3}"/>
+ <label caption="Ablationsdybde:"/>
+ <lineedit name="ref_behandling.kirurgisk_procedure.fotoablation.ablationsdybde" script="lt500gt0" regexp="\d{1,3}"/>
<label caption="um"/>
<spacer/>
</frame>
- <frame name="flex_algoritme" layout="hbox">
- <label caption="Kanttykkelse:"/>
- <lineedit name="ref_behandling.kirurgisk_procedure.tilstraebtrefraktionsaendring.kanttykkelse" regexp="\d{1,2}"/>
- <label caption="mym"/>
- <spacer/>
- </frame>
</frame>
<!-- Begin 3rd outer frame -->
@@ -592,11 +413,6 @@
<checkbox name="ref_behandling.kirurgisk_procedure.lasek.part2" caption="Epithelet replaceres." truevalue="Epithelet replaceres." falsevalue=""/>
</frame>
- <!-- FLEX frame -->
- <frame name="flex_frame2" caption="FLEX" layout="vbox">
- <checkbox name="ref_behandling.kirurgisk_procedure.flex.part2" caption="FLEX flappen åbnes, vævslinsen ekstraheres, lappen replaceres. Der irrigeres med isotont saltvand, og flappen tørrer i 2 minutter." truevalue="FLEX flappen åbnes, vævslinsen ekstraheres, lappen replaceres. Der irrigeres med isotont saltvand, og flappen tørrer i 2 minutter." falsevalue=""/>
- </frame>
-
<!-- End 3rd outer frame -->
</frame>
diff --git a/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml b/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml
index 8605a0c..e499779 100644
--- a/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml
+++ b/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml
@@ -24,7 +24,6 @@
<combobox name="ref_efterkontrol.overskrift.type">
<item caption="LASIK" value="LASIK"/>
<item caption="PRK" value="PRK"/>
- <item caption="FLEX" value="FLEX"/>
<item caption="reLASIK" value="reLASIK"/>
<item caption="rePRK" value="rePRK"/>
</combobox>
diff --git a/server/xml/macros/ref_foerstedagskontol-overskrift-1.0.xml b/server/xml/macros/ref_foerstedagskontol-overskrift-1.0.xml
index ddcec10..5717a7e 100644
--- a/server/xml/macros/ref_foerstedagskontol-overskrift-1.0.xml
+++ b/server/xml/macros/ref_foerstedagskontol-overskrift-1.0.xml
@@ -18,7 +18,6 @@
<combobox name="ref_foerstedagskontrol.overskrift.type">
<item caption="LASIK" value="LASIK"/>
<item caption="PRK" value="PRK"/>
- <item caption="FLEX" value="FLEX"/>
<item caption="reLASIK" value="reLASIK"/>
<item caption="rePRK" value="rePRK"/>
</combobox>
diff --git a/server/xml/macros/ref_forunders-konklusion-1.0.xml b/server/xml/macros/ref_forunders-konklusion-1.0.xml
index c1db63c..ba59848 100644
--- a/server/xml/macros/ref_forunders-konklusion-1.0.xml
+++ b/server/xml/macros/ref_forunders-konklusion-1.0.xml
@@ -69,7 +69,6 @@
<item caption="Topografistyret LASIK" value="Topografistyret LASIK"/>
<item caption="Topografistyret PRK" value="Topografistyret PRK"/>
<item caption="LASEK" value="LASEK"/>
- <item caption="FLEX" value="FLEX"/>
<altitem caption="Andet" value="andet" layout="hbox" innerwidget="ref_forunders.konklusion.behandling.andet">
<label caption="Andet:"/>
<lineedit name="ref_forunders.konklusion.behandling.andet"/>
diff --git a/server/xml/macros/test_metawidget.xml b/server/xml/macros/test_metawidget.xml
index 0e66ce5..a2d51ea 100644
--- a/server/xml/macros/test_metawidget.xml
+++ b/server/xml/macros/test_metawidget.xml
@@ -10,10 +10,8 @@
<widgets caption="Test Metawidget"
layout="vbox">
- <label caption="&lt;"/>
-
<metawidget layout="vbox" name="dims" format="${test1}: ${test2}" storechildren="true">
- <lineedit name="test1" value="&lt;test"/>
+ <lineedit name="test1" value="test"/>
<checkbox name="test2" value="ja" truevalue="ja" falsevalue="nej" caption="Og svaret er?"/>
</metawidget>
diff --git a/server/xml/macros/visus-autoref-1.0.xml b/server/xml/macros/visus-autoref-1.0.xml
index 4d6a530..439e5b0 100644
--- a/server/xml/macros/visus-autoref-1.0.xml
+++ b/server/xml/macros/visus-autoref-1.0.xml
@@ -284,7 +284,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -470,7 +470,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
diff --git a/server/xml/macros/visus-egen_korr-1.0.xml b/server/xml/macros/visus-egen_korr-1.0.xml
index 74f6a40..32c0914 100644
--- a/server/xml/macros/visus-egen_korr-1.0.xml
+++ b/server/xml/macros/visus-egen_korr-1.0.xml
@@ -437,7 +437,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -604,7 +604,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -768,7 +768,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -935,7 +935,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -1102,7 +1102,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
diff --git a/server/xml/macros/visus-manifest_refraktion-1.0.xml b/server/xml/macros/visus-manifest_refraktion-1.0.xml
index 68d110f..74b8ea3 100644
--- a/server/xml/macros/visus-manifest_refraktion-1.0.xml
+++ b/server/xml/macros/visus-manifest_refraktion-1.0.xml
@@ -10,6 +10,10 @@
fjern tilsvarende GUI felter der ikke skal bruges
-->
<resume language="lua">
+ function lttoxml(value)
+ return string.gsub(value, '&lt;', '&amp;lt;')
+ end
+
out = ''
if ( getValue('visus.manifest_refraktion.mangler.odxt') == '' or getValue('visus.manifest_refraktion.mangler.osin') == '' or getValue('visus.manifest_refraktion.ou') ~= '' )
then
@@ -21,7 +25,7 @@
out = out .. 'o.dxt: '
if ( getValue('visus.manifest_refraktion.snellen.odxt') ~= '' )
then
- out = out .. getValue('visus.manifest_refraktion.snellen.odxt')
+ out = out .. lttoxml(getValue('visus.manifest_refraktion.snellen.odxt'))
if ( getValue('visus.manifest_refraktion.etdrs.odxt') == '' )
then
out = out .. ', '
@@ -54,7 +58,7 @@
then
if ( getValue('visus.manifest_refraktion.st_hul.snellen.odxt') ~= '' )
then
- out = out .. ', ' .. getValue('visus.manifest_refraktion.st_hul.snellen.odxt')
+ out = out .. ', ' .. lttoxml(getValue('visus.manifest_refraktion.st_hul.snellen.odxt'))
end
if ( getValue('visus.manifest_refraktion.st_hul.etdrs.odxt') ~= '' )
then
@@ -74,7 +78,7 @@
out = out .. 'o.sin: '
if ( getValue('visus.manifest_refraktion.snellen.osin') ~= '' )
then
- out = out .. getValue('visus.manifest_refraktion.snellen.osin')
+ out = out .. lttoxml(getValue('visus.manifest_refraktion.snellen.osin'))
if ( getValue('visus.manifest_refraktion.etdrs.osin') == '' )
then
out = out .. ', '
@@ -107,7 +111,7 @@
then
if ( getValue('visus.manifest_refraktion.st_hul.snellen.osin') ~= '' )
then
- out = out .. ', ' .. getValue('visus.manifest_refraktion.st_hul.snellen.osin')
+ out = out .. ', ' .. lttoxml(getValue('visus.manifest_refraktion.st_hul.snellen.osin'))
end
if ( getValue('visus.manifest_refraktion.st_hul.etdrs.osin') ~= '' )
then
@@ -128,7 +132,7 @@
out = out .. 'o.u: '
if ( getValue('visus.manifest_refraktion.snellen.ou') ~= '' )
then
- out = out .. getValue('visus.manifest_refraktion.snellen.ou')
+ out = out .. lttoxml(getValue('visus.manifest_refraktion.snellen.ou'))
end
if ( getValue('visus.manifest_refraktion.etdrs.ou') ~= '' )
then
@@ -433,7 +437,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&lt;0,05" value="&lt;0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -600,7 +604,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&lt;0,05" value="&lt;0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -764,7 +768,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&lt;0,05" value="&lt;0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -931,7 +935,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&lt;0,05" value="&lt;0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -1098,7 +1102,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&lt;0,05" value="&lt;0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
diff --git a/server/xml/macros/visus-ou-1.0.xml b/server/xml/macros/visus-ou-1.0.xml
index 9de8d00..3382b4d 100644
--- a/server/xml/macros/visus-ou-1.0.xml
+++ b/server/xml/macros/visus-ou-1.0.xml
@@ -140,7 +140,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
diff --git a/server/xml/macros/visus-template-1.0.xml b/server/xml/macros/visus-template-1.0.xml
index 2d56288..7199903 100644
--- a/server/xml/macros/visus-template-1.0.xml
+++ b/server/xml/macros/visus-template-1.0.xml
@@ -11,11 +11,11 @@
-->
<resume language="lua">
function lttoxml(value)
- return string.gsub(value, '&lt;', '&amp;lt;')
+ value = string.gsub(value, '&lt;', '&amp;lt;')
+ return value
end
out = ''
-
if ( getValue('visus.template.mangler.odxt') == '' or getValue('visus.template.mangler.osin') == '' or getValue('visus.template.ou') ~= '' )
then
out = out .. 'Visus template:\n'
@@ -138,7 +138,7 @@
then
out = out .. ', ' .. getValue('visus.template.st_hul.etdrs.osin') .. ' ETDRS'
end
- out = out .. ' st.h.'
+ out = out .. ' st.h.\n'
end
out = out .. '\n'
end
@@ -457,7 +457,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -644,7 +644,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -808,7 +808,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -995,7 +995,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -1162,7 +1162,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
diff --git a/server/xml/macros/visus-uden_korr-1.0.xml b/server/xml/macros/visus-uden_korr-1.0.xml
index c5c3405..886b262 100644
--- a/server/xml/macros/visus-uden_korr-1.0.xml
+++ b/server/xml/macros/visus-uden_korr-1.0.xml
@@ -418,7 +418,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -565,7 +565,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -729,7 +729,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -876,7 +876,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -1043,7 +1043,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
- <item caption="&amp;lt;0,05" value="Dårligere end 0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 05:20:30 +0000