From 2cd1f061475f496f20c9f9e297eef210524b55cd Mon Sep 17 00:00:00 2001
From: senator <senator>
Date: Wed, 4 Nov 2009 10:41:55 +0000
Subject: Further refined visus template, also minor changes to other things

---
 server/xml/macros/ref-spaltelampe-1.0.xml          |   4 +-
 .../xml/macros/ref_efterkontrol-overskrift-1.0.xml |   3 +-
 server/xml/macros/spaltelampe-template-1.0.xml     |   4 +-
 server/xml/macros/visus-template-1.0.xml           | 651 ++++++++++++++++++++-
 server/xml/templates/ref_forunders.xml             |   1 +
 5 files changed, 643 insertions(+), 20 deletions(-)

diff --git a/server/xml/macros/ref-spaltelampe-1.0.xml b/server/xml/macros/ref-spaltelampe-1.0.xml
index 72304ab..c06b7c6 100644
--- a/server/xml/macros/ref-spaltelampe-1.0.xml
+++ b/server/xml/macros/ref-spaltelampe-1.0.xml
@@ -308,7 +308,7 @@
 		<label/>
 	      </frame>
 	      <frame layout="vbox">
-		<checkbox name="spaltelampe.right.epithel.ophelet" caption="Ophelet" falsevalue="" truevalue="Ophelet"/>
+		<checkbox name="spaltelampe.right.epithel.ophelet" caption="Intakt" falsevalue="" truevalue="Intakt"/>
 		<checkbox name="spaltelampe.right.epithel.central_epitheldefekt" caption="Central epitheldefekt" falsevalue="" truevalue="Central epitheldefekt"/>
 		<checkbox name="spaltelampe.right.epithel.toerhedsforandringer" caption="Tørhedsforandringer" falsevalue="" truevalue="Tørhedsforandringer"/>
 		<frame layout="hbox">
@@ -498,7 +498,7 @@
 		<label/>
 	      </frame>
 	      <frame layout="vbox">
-		<checkbox name="spaltelampe.left.epithel.ophelet" caption="Ophelet" falsevalue="" truevalue="Ophelet"/>
+		<checkbox name="spaltelampe.left.epithel.ophelet" caption="Intakt" falsevalue="" truevalue="Intakt"/>
 		<checkbox name="spaltelampe.left.epithel.central_epitheldefekt" caption="Central epitheldefekt" falsevalue="" truevalue="Central epitheldefekt"/>
 		<checkbox name="spaltelampe.left.epithel.toerhedsforandringer" caption="Tørhedsforandringer" falsevalue="" truevalue="Tørhedsforandringer"/>
 		<frame layout="hbox">
diff --git a/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml b/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml
index 7da7268..8c005f2 100644
--- a/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml
+++ b/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml
@@ -27,7 +27,8 @@
 	<item caption="reLASIK" value="reLASIK"/>
 	<item caption="rePRK" value="rePRK"/>
       </combobox>
-      <spacer/>
+      <label/>
+      <label/>
     </frame>
     <frame layout="hbox">
       <label caption="Seneste besøg for"/>
diff --git a/server/xml/macros/spaltelampe-template-1.0.xml b/server/xml/macros/spaltelampe-template-1.0.xml
index ecc4cdb..f9018c4 100644
--- a/server/xml/macros/spaltelampe-template-1.0.xml
+++ b/server/xml/macros/spaltelampe-template-1.0.xml
@@ -308,7 +308,7 @@
 		<label/>
 	      </frame>
 	      <frame layout="vbox">
-		<checkbox name="spaltelampe.right.epithel.ophelet" caption="Ophelet" falsevalue="" truevalue="Ophelet"/>
+		<checkbox name="spaltelampe.right.epithel.ophelet" caption="Intakt" falsevalue="" truevalue="Intakt"/>
 		<checkbox name="spaltelampe.right.epithel.central_epitheldefekt" caption="Central epitheldefekt" falsevalue="" truevalue="Central epitheldefekt"/>
 		<checkbox name="spaltelampe.right.epithel.toerhedsforandringer" caption="Tørhedsforandringer" falsevalue="" truevalue="Tørhedsforandringer"/>
 		<frame layout="hbox">
@@ -498,7 +498,7 @@
 		<label/>
 	      </frame>
 	      <frame layout="vbox">
-		<checkbox name="spaltelampe.left.epithel.ophelet" caption="Ophelet" falsevalue="" truevalue="Ophelet"/>
+		<checkbox name="spaltelampe.left.epithel.ophelet" caption="Intakt" falsevalue="" truevalue="Intakt"/>
 		<checkbox name="spaltelampe.left.epithel.central_epitheldefekt" caption="Central epitheldefekt" falsevalue="" truevalue="Central epitheldefekt"/>
 		<checkbox name="spaltelampe.left.epithel.toerhedsforandringer" caption="Tørhedsforandringer" falsevalue="" truevalue="Tørhedsforandringer"/>
 		<frame layout="hbox">
diff --git a/server/xml/macros/visus-template-1.0.xml b/server/xml/macros/visus-template-1.0.xml
index 5bf0853..b7dcb19 100644
--- a/server/xml/macros/visus-template-1.0.xml
+++ b/server/xml/macros/visus-template-1.0.xml
@@ -17,10 +17,6 @@
       then
         out = out .. ', ' .. getValue('visus.template.kontrast.right') .. ' kontrast'
       end
-      if ( getValue('visus.template.st_hul.right') ~= '' )
-      then
-        out = out .. ', ' .. getValue('visus.template.st_hul.right')
-      end
       out = out .. ':\n'
       if ( getValue('visus.template.snellen.right') ~= '' )
       then
@@ -51,12 +47,32 @@
         out = out .. ', ' .. getValue('visus.template.add.grader.right') .. ' grader'
       end
       out = out .. '\n'
+      if ( getValue('visus.template.st_hul.right') ~= '' )
+      then
+        out = out .. 'Måling foretaget med st. hul:\n'
+        if ( getValue('visus.template.st_hul.snellen.right') ~= '' )
+        then
+          out = out .. 'Snellen: ' .. getValue('visus.template.st_hul.snellen.right') .. '\n'
+        end
+        if ( getValue('visus.template.st_hul.etdrs.right') ~= '' )
+        then
+          out = out .. 'ETDRS: ' .. getValue('visus.template.st_hul.etdrs.right') .. '\n'
+        end
+      end
       if ( getValue('visus.template.missing.left') == '' )
       then
         out = out .. '\n'
       end
     end
 
+
+
+
+
+
+
+
+
     if ( getValue('visus.template.missing.left') == '' )
     then
       out = out .. 'Visus, template, o.sin'
@@ -64,10 +80,6 @@
       then
         out = out .. ', ' .. getValue('visus.template.kontrast.left') .. ' kontrast'
       end
-      if ( getValue('visus.template.st_hul.left') ~= '' )
-      then
-        out = out .. ', ' .. getValue('visus.template.st_hul.left')
-      end
       out = out .. ':\n'
       if ( getValue('visus.template.snellen.left') ~= '' )
       then
@@ -98,12 +110,60 @@
         out = out .. ', ' .. getValue('visus.template.add.grader.left') .. ' grader'
       end
       out = out .. '\n'
+      if ( getValue('visus.template.st_hul.left') ~= '' )
+      then
+        out = out .. 'Måling foretaget med st. hul:\n'
+        if ( getValue('visus.template.st_hul.snellen.left') ~= '' )
+        then
+          out = out .. 'Snellen: ' .. getValue('visus.template.st_hul.snellen.left') .. '\n'
+        end
+        if ( getValue('visus.template.st_hul.etdrs.left') ~= '' )
+        then
+          out = out .. 'ETDRS: ' .. getValue('visus.template.st_hul.etdrs.left') .. '\n'
+        end
+      end
       if ( getValue('visus.template.missing.left') == '' )
       then
         out = out .. '\n'
       end
     end
 
+
+
+
+
+
+
+
+
+
+    if ( getValue('visus.template.ou') ~= '' )
+    then
+      out = out .. 'Visus, template, o.u'
+      if ( getValue('visus.template.kontrast.ou') ~= '' )
+      then
+        out = out .. ', ' .. getValue('visus.template.kontrast.ou') .. ' kontrast'
+      end
+      out = out .. ':\n'
+      if ( getValue('visus.template.snellen.ou') ~= '' )
+      then
+        out = out .. 'Snellen: ' .. getValue('visus.template.snellen.ou') .. '\n'
+      end
+      if ( getValue('visus.template.etdrs.ou') ~= '' )
+      then
+        out = out .. 'ETDRS: ' .. getValue('visus.template.etdrs.ou') .. '\n'
+      end
+      out = out .. 'Korr.: ' .. getValue('visus.template.korr.sf.ou') .. ' sf'
+      if ( getValue('visus.template.korr.cyl.ou') ~= '' )
+      then
+        out = out .. ', ' .. getValue('visus.template.korr.cyl.ou') .. ' cyl'
+      end
+      if ( getValue('visus.template.korr.grader.ou') ~= '' )
+      then
+        out = out .. ', ' .. getValue('visus.template.korr.grader.ou') .. ' grader'
+      end
+    end
+
     return out
   </resume>
   <queries>
@@ -235,6 +295,93 @@
       end
       return true
     </script>
+    <script language="lua" name="st_hul.snellen.right">
+      if (value == '')
+      then
+        if ( getValue('visus.template.st_hul.etdrs.right') == '' )
+        then
+          return false
+        end
+      end
+      return true
+    </script>
+    <script language="lua" name="st_hul.snellen.left">
+      if (value == '')
+      then
+        if ( getValue('visus.template.st_hul.etdrs.left') == '' )
+        then
+          return false
+        end
+      end
+      return true
+    </script>
+    <script language="lua" name="st_hul.etdrs.right">
+      if (value == '')
+      then
+        if ( getValue('visus.template.st_hul.snellen.right') == '' )
+        then
+          return false
+        end
+      end
+      return true
+    </script>
+    <script language="lua" name="st_hul.etdrs.left">
+      if (value == '')
+      then
+        if ( getValue('visus.template.st_hul.snellen.left') == '' )
+        then
+          return false
+        end
+      end
+      return true
+    </script>
+    <script language="lua" name="etdrs.ou">
+      if (value == '')
+      then
+        if ( getValue('visus.template.snellen.ou') == '' )
+        then
+          return false
+        end
+      end
+      return true
+    </script>
+    <script language="lua" name="snellen.ou">
+      if (value == '')
+      then
+        if ( getValue('visus.template.etdrs.ou') == '' )
+        then
+          return false
+        end
+      end
+      return true
+    </script>
+    <script language="lua" name="st_hul_check.right">
+      if (value == '')
+      then
+        disable('st_hul_frame.right')
+      else
+        enable('st_hul_frame.right')
+      end
+      return true
+    </script>
+    <script language="lua" name="st_hul_check.left">
+      if (value == '')
+      then
+        disable('st_hul_frame.left')
+      else
+        enable('st_hul_frame.left')
+      end
+      return true
+    </script>
+    <script language="lua" name="st_hul_check.ou">
+      if (value == '')
+      then
+        disable('st_hul_frame.ou')
+      else
+        enable('st_hul_frame.ou')
+      end
+      return true
+    </script>
     <script language="lua" name="right_eye">
       if ( value == 'mangler' )
       then
@@ -253,8 +400,17 @@
       end
       return true
     </script>
+    <script language="lua" name="ou">
+      if ( value == '' )
+      then
+        disable('ou_frame')
+      else
+        enable('ou_frame')
+      end
+      return true
+    </script>
   </scripts>
-  <widgets caption="Visus - manifest refraktion"
+  <widgets caption="Visus - template"
           layout="vbox">
 
     <frame layout="hbox">
@@ -276,9 +432,6 @@
 	    </combobox>
 	    <spacer/>
 	  </frame>
-	  <frame layout="hbox">
-	    <checkbox name="visus.template.st_hul.right" caption="Der er anvendt st. hul" truevalue="st. hul er anvendt" falsevalue=""/>
-	  </frame>
 	  <frame layout="hbox">
 	    <frame layout="vbox">
 	      <label caption="Snellen:"/>
@@ -458,6 +611,151 @@
 		<lineedit name="visus.template.add.grader.right" regexp="|[\d]+" script="lt359gt0" value=""/>
 	      </frame>
 	    </frame>
+	    <frame layout="hbox">
+	      <checkbox name="visus.template.st_hul.right" caption="Yderligere måling med st. hul (udfyld herunder)" truevalue="true" falsevalue="" script="st_hul_check.right"/>
+	    </frame>
+	    <frame layout="hbox" name="st_hul_frame.right">
+	      <frame layout="vbox">
+		<label caption="Snellen:"/>
+		<combobox name="visus.template.st_hul.snellen.right" layout="vbox" type="search" value="" script="st_hul.snellen.right">
+		  <item caption="Ikke udfyldt" value=""/>
+		  <item caption="2,0" value="2,0"/>
+		  <item caption="1,6" value="1,6"/>
+		  <item caption="1,33" value="1,33"/>
+		  <item caption="1,0" value="1,0"/>
+		  <item caption="0,8" value="0,8"/>
+		  <item caption="0,67" value="0,67"/>
+		  <item caption="0,5" value="0,5"/>
+		  <item caption="0,4" value="0,4"/>
+		  <item caption="0,32" value="0,32"/>
+		  <item caption="0,25" value="0,25"/>
+		  <item caption="0,2" value="0,2"/>
+		  <item caption="0,16" value="0,16"/>
+		  <item caption="0,125" value="0,125"/>
+		  <item caption="0,1" value="0,1"/>
+		  <item caption="0,08" value="0,08"/>
+		  <item caption="0,05" value="0,05"/>
+		  <item caption="6/60" value="6/60"/>
+		  <item caption="3/60" value="3/60"/>
+		  <item caption="1/18" value="1/18"/>
+		  <item caption="1/24" value="1/24"/>
+		  <item caption="1/36" value="1/36"/>
+		  <item caption="1/60" value="1/60"/>
+		  <item caption="FGT" value="FGT"/>
+		  <item caption="HBV" value="HBV"/>
+		  <item caption="+L+P" value="+L+P"/>
+		  <item caption="+L-P" value="+L-P"/>
+		  <item caption="-L" value="-L"/>
+		</combobox>
+	      </frame>
+	      <frame layout="vbox">
+		<label caption="ETDRS:"/>
+		<combobox name="visus.template.st_hul.etdrs.right" value="" type="search" script="st_hul.etdrs.right">
+		  <item caption="Ikke udfyldt" value=""/>
+		  <item caption="0" value="0"/>
+		  <item caption="1" value="1"/>
+		  <item caption="2" value="2"/>
+		  <item caption="3" value="3"/>
+		  <item caption="4" value="4"/>
+		  <item caption="5" value="5"/>
+		  <item caption="6" value="6"/>
+		  <item caption="7" value="7"/>
+		  <item caption="8" value="8"/>
+		  <item caption="9" value="9"/>
+		  <item caption="10" value="10"/>
+		  <item caption="11" value="11"/>
+		  <item caption="12" value="12"/>
+		  <item caption="13" value="13"/>
+		  <item caption="14" value="14"/>
+		  <item caption="15" value="15"/>
+		  <item caption="16" value="16"/>
+		  <item caption="17" value="17"/>
+		  <item caption="18" value="18"/>
+		  <item caption="19" value="19"/>
+		  <item caption="20" value="20"/>
+		  <item caption="21" value="21"/>
+		  <item caption="22" value="22"/>
+		  <item caption="23" value="23"/>
+		  <item caption="24" value="24"/>
+		  <item caption="25" value="25"/>
+		  <item caption="26" value="26"/>
+		  <item caption="27" value="27"/>
+		  <item caption="28" value="28"/>
+		  <item caption="29" value="29"/>
+		  <item caption="30" value="30"/>
+		  <item caption="31" value="31"/>
+		  <item caption="32" value="32"/>
+		  <item caption="33" value="33"/>
+		  <item caption="34" value="34"/>
+		  <item caption="35" value="35"/>
+		  <item caption="36" value="36"/>
+		  <item caption="37" value="37"/>
+		  <item caption="38" value="38"/>
+		  <item caption="39" value="39"/>
+		  <item caption="40" value="40"/>
+		  <item caption="41" value="41"/>
+		  <item caption="42" value="42"/>
+		  <item caption="43" value="43"/>
+		  <item caption="44" value="44"/>
+		  <item caption="45" value="45"/>
+		  <item caption="46" value="46"/>
+		  <item caption="47" value="47"/>
+		  <item caption="48" value="48"/>
+		  <item caption="49" value="49"/>
+		  <item caption="50" value="50"/>
+		  <item caption="51" value="51"/>
+		  <item caption="52" value="52"/>
+		  <item caption="53" value="53"/>
+		  <item caption="54" value="54"/>
+		  <item caption="55" value="55"/>
+		  <item caption="56" value="56"/>
+		  <item caption="57" value="57"/>
+		  <item caption="58" value="58"/>
+		  <item caption="59" value="59"/>
+		  <item caption="60" value="60"/>
+		  <item caption="61" value="61"/>
+		  <item caption="62" value="62"/>
+		  <item caption="63" value="63"/>
+		  <item caption="64" value="64"/>
+		  <item caption="65" value="65"/>
+		  <item caption="66" value="66"/>
+		  <item caption="67" value="67"/>
+		  <item caption="68" value="68"/>
+		  <item caption="69" value="69"/>
+		  <item caption="70" value="70"/>
+		  <item caption="71" value="71"/>
+		  <item caption="72" value="72"/>
+		  <item caption="73" value="73"/>
+		  <item caption="74" value="74"/>
+		  <item caption="75" value="75"/>
+		  <item caption="76" value="76"/>
+		  <item caption="77" value="77"/>
+		  <item caption="78" value="78"/>
+		  <item caption="79" value="79"/>
+		  <item caption="80" value="80"/>
+		  <item caption="81" value="81"/>
+		  <item caption="82" value="82"/>
+		  <item caption="83" value="83"/>
+		  <item caption="84" value="84"/>
+		  <item caption="85" value="85"/>
+		  <item caption="86" value="86"/>
+		  <item caption="87" value="87"/>
+		  <item caption="88" value="88"/>
+		  <item caption="89" value="89"/>
+		  <item caption="90" value="90"/>
+		  <item caption="91" value="91"/>
+		  <item caption="92" value="92"/>
+		  <item caption="93" value="93"/>
+		  <item caption="94" value="94"/>
+		  <item caption="95" value="95"/>
+		  <item caption="96" value="96"/>
+		  <item caption="97" value="97"/>
+		  <item caption="98" value="98"/>
+		  <item caption="99" value="99"/>
+		  <item caption="100" value="100"/>
+		</combobox>
+	      </frame>
+	    </frame>
 	  </frame>
 	</frame>
       </frame>
@@ -479,9 +777,6 @@
 	    </combobox>
 	    <spacer/>
 	  </frame>
-	  <frame layout="hbox">
-	    <checkbox name="visus.template.st_hul.left" caption="Der er anvendt st. hul" truevalue="st. hul er anvendt" falsevalue=""/>
-	  </frame>
 	  <frame layout="hbox">
 	    <frame layout="vbox">
 	      <label caption="Snellen:"/>
@@ -661,12 +956,338 @@
 		<lineedit name="visus.template.add.grader.left" regexp="|[\d]+" script="lt359gt0" value=""/>
 	      </frame>
 	    </frame>
+	    <frame layout="hbox">
+	      <checkbox name="visus.template.st_hul.left" caption="Yderligere måling med st. hul (udfyld herunder)" truevalue="true" falsevalue="" script="st_hul_check.left"/>
+	    </frame>
+	    <frame layout="hbox" name="st_hul_frame.left">
+	      <frame layout="vbox">
+		<label caption="Snellen:"/>
+		<combobox name="visus.template.st_hul.snellen.left" layout="vbox" type="search" value="" script="st_hul.snellen.left">
+		  <item caption="Ikke udfyldt" value=""/>
+		  <item caption="2,0" value="2,0"/>
+		  <item caption="1,6" value="1,6"/>
+		  <item caption="1,33" value="1,33"/>
+		  <item caption="1,0" value="1,0"/>
+		  <item caption="0,8" value="0,8"/>
+		  <item caption="0,67" value="0,67"/>
+		  <item caption="0,5" value="0,5"/>
+		  <item caption="0,4" value="0,4"/>
+		  <item caption="0,32" value="0,32"/>
+		  <item caption="0,25" value="0,25"/>
+		  <item caption="0,2" value="0,2"/>
+		  <item caption="0,16" value="0,16"/>
+		  <item caption="0,125" value="0,125"/>
+		  <item caption="0,1" value="0,1"/>
+		  <item caption="0,08" value="0,08"/>
+		  <item caption="0,05" value="0,05"/>
+		  <item caption="6/60" value="6/60"/>
+		  <item caption="3/60" value="3/60"/>
+		  <item caption="1/18" value="1/18"/>
+		  <item caption="1/24" value="1/24"/>
+		  <item caption="1/36" value="1/36"/>
+		  <item caption="1/60" value="1/60"/>
+		  <item caption="FGT" value="FGT"/>
+		  <item caption="HBV" value="HBV"/>
+		  <item caption="+L+P" value="+L+P"/>
+		  <item caption="+L-P" value="+L-P"/>
+		  <item caption="-L" value="-L"/>
+		</combobox>
+	      </frame>
+	      <frame layout="vbox">
+		<label caption="ETDRS:"/>
+		<combobox name="visus.template.st_hul.etdrs.left" value="" type="search" script="st_hul.etdrs.left">
+		  <item caption="Ikke udfyldt" value=""/>
+		  <item caption="0" value="0"/>
+		  <item caption="1" value="1"/>
+		  <item caption="2" value="2"/>
+		  <item caption="3" value="3"/>
+		  <item caption="4" value="4"/>
+		  <item caption="5" value="5"/>
+		  <item caption="6" value="6"/>
+		  <item caption="7" value="7"/>
+		  <item caption="8" value="8"/>
+		  <item caption="9" value="9"/>
+		  <item caption="10" value="10"/>
+		  <item caption="11" value="11"/>
+		  <item caption="12" value="12"/>
+		  <item caption="13" value="13"/>
+		  <item caption="14" value="14"/>
+		  <item caption="15" value="15"/>
+		  <item caption="16" value="16"/>
+		  <item caption="17" value="17"/>
+		  <item caption="18" value="18"/>
+		  <item caption="19" value="19"/>
+		  <item caption="20" value="20"/>
+		  <item caption="21" value="21"/>
+		  <item caption="22" value="22"/>
+		  <item caption="23" value="23"/>
+		  <item caption="24" value="24"/>
+		  <item caption="25" value="25"/>
+		  <item caption="26" value="26"/>
+		  <item caption="27" value="27"/>
+		  <item caption="28" value="28"/>
+		  <item caption="29" value="29"/>
+		  <item caption="30" value="30"/>
+		  <item caption="31" value="31"/>
+		  <item caption="32" value="32"/>
+		  <item caption="33" value="33"/>
+		  <item caption="34" value="34"/>
+		  <item caption="35" value="35"/>
+		  <item caption="36" value="36"/>
+		  <item caption="37" value="37"/>
+		  <item caption="38" value="38"/>
+		  <item caption="39" value="39"/>
+		  <item caption="40" value="40"/>
+		  <item caption="41" value="41"/>
+		  <item caption="42" value="42"/>
+		  <item caption="43" value="43"/>
+		  <item caption="44" value="44"/>
+		  <item caption="45" value="45"/>
+		  <item caption="46" value="46"/>
+		  <item caption="47" value="47"/>
+		  <item caption="48" value="48"/>
+		  <item caption="49" value="49"/>
+		  <item caption="50" value="50"/>
+		  <item caption="51" value="51"/>
+		  <item caption="52" value="52"/>
+		  <item caption="53" value="53"/>
+		  <item caption="54" value="54"/>
+		  <item caption="55" value="55"/>
+		  <item caption="56" value="56"/>
+		  <item caption="57" value="57"/>
+		  <item caption="58" value="58"/>
+		  <item caption="59" value="59"/>
+		  <item caption="60" value="60"/>
+		  <item caption="61" value="61"/>
+		  <item caption="62" value="62"/>
+		  <item caption="63" value="63"/>
+		  <item caption="64" value="64"/>
+		  <item caption="65" value="65"/>
+		  <item caption="66" value="66"/>
+		  <item caption="67" value="67"/>
+		  <item caption="68" value="68"/>
+		  <item caption="69" value="69"/>
+		  <item caption="70" value="70"/>
+		  <item caption="71" value="71"/>
+		  <item caption="72" value="72"/>
+		  <item caption="73" value="73"/>
+		  <item caption="74" value="74"/>
+		  <item caption="75" value="75"/>
+		  <item caption="76" value="76"/>
+		  <item caption="77" value="77"/>
+		  <item caption="78" value="78"/>
+		  <item caption="79" value="79"/>
+		  <item caption="80" value="80"/>
+		  <item caption="81" value="81"/>
+		  <item caption="82" value="82"/>
+		  <item caption="83" value="83"/>
+		  <item caption="84" value="84"/>
+		  <item caption="85" value="85"/>
+		  <item caption="86" value="86"/>
+		  <item caption="87" value="87"/>
+		  <item caption="88" value="88"/>
+		  <item caption="89" value="89"/>
+		  <item caption="90" value="90"/>
+		  <item caption="91" value="91"/>
+		  <item caption="92" value="92"/>
+		  <item caption="93" value="93"/>
+		  <item caption="94" value="94"/>
+		  <item caption="95" value="95"/>
+		  <item caption="96" value="96"/>
+		  <item caption="97" value="97"/>
+		  <item caption="98" value="98"/>
+		  <item caption="99" value="99"/>
+		  <item caption="100" value="100"/>
+		</combobox>
+	      </frame>
+	    </frame>
 	  </frame>
 	</frame>
       </frame>
 
     </frame>
 
+      <!-- Begge øjne -->
+      <frame layout="vbox">
+	<checkbox caption="Aktiver o.u. måling"
+		  name="visus.template.ou" script="ou"
+		  truevalue="ou" falsevalue="" value=""/>
+	<frame name="ou_frame" caption="o.u." layout="vbox">
+	  <frame layout="hbox">
+	    <label caption="Kontrast:"/>
+	    <combobox name="visus.template.kontrast.ou" value="">
+	      <item caption="Ej relevant" value=""/>
+	      <item caption="20%" value="20%"/>
+	      <item caption="50%" value="50%"/>
+	      <item caption="75%" value="75%"/>
+	    </combobox>
+	    <spacer/>
+	  </frame>
+	  <frame layout="hbox">
+	    <frame layout="vbox">
+	      <label caption="Snellen:"/>
+	      <combobox name="visus.template.snellen.ou" layout="vbox" type="search" value="" script="snellen.ou">
+		<item caption="Ikke udfyldt" value=""/>
+		<item caption="2,0" value="2,0"/>
+		<item caption="1,6" value="1,6"/>
+		<item caption="1,33" value="1,33"/>
+		<item caption="1,0" value="1,0"/>
+		<item caption="0,8" value="0,8"/>
+		<item caption="0,67" value="0,67"/>
+		<item caption="0,5" value="0,5"/>
+		<item caption="0,4" value="0,4"/>
+		<item caption="0,32" value="0,32"/>
+		<item caption="0,25" value="0,25"/>
+		<item caption="0,2" value="0,2"/>
+		<item caption="0,16" value="0,16"/>
+		<item caption="0,125" value="0,125"/>
+		<item caption="0,1" value="0,1"/>
+		<item caption="0,08" value="0,08"/>
+		<item caption="0,05" value="0,05"/>
+		<item caption="6/60" value="6/60"/>
+		<item caption="3/60" value="3/60"/>
+		<item caption="1/18" value="1/18"/>
+		<item caption="1/24" value="1/24"/>
+		<item caption="1/36" value="1/36"/>
+		<item caption="1/60" value="1/60"/>
+		<item caption="FGT" value="FGT"/>
+		<item caption="HBV" value="HBV"/>
+		<item caption="+L+P" value="+L+P"/>
+		<item caption="+L-P" value="+L-P"/>
+		<item caption="-L" value="-L"/>
+	      </combobox>
+	    </frame>
+	    <frame layout="vbox">
+	      <label caption="ETDRS:"/>
+	      <combobox name="visus.template.etdrs.ou" value="" type="search" script="etdrs.ou">
+		<item caption="Ikke udfyldt" value=""/>
+		<item caption="0" value="0"/>
+		<item caption="1" value="1"/>
+		<item caption="2" value="2"/>
+		<item caption="3" value="3"/>
+		<item caption="4" value="4"/>
+		<item caption="5" value="5"/>
+		<item caption="6" value="6"/>
+		<item caption="7" value="7"/>
+		<item caption="8" value="8"/>
+		<item caption="9" value="9"/>
+		<item caption="10" value="10"/>
+		<item caption="11" value="11"/>
+		<item caption="12" value="12"/>
+		<item caption="13" value="13"/>
+		<item caption="14" value="14"/>
+		<item caption="15" value="15"/>
+		<item caption="16" value="16"/>
+		<item caption="17" value="17"/>
+		<item caption="18" value="18"/>
+		<item caption="19" value="19"/>
+		<item caption="20" value="20"/>
+		<item caption="21" value="21"/>
+		<item caption="22" value="22"/>
+		<item caption="23" value="23"/>
+		<item caption="24" value="24"/>
+		<item caption="25" value="25"/>
+		<item caption="26" value="26"/>
+		<item caption="27" value="27"/>
+		<item caption="28" value="28"/>
+		<item caption="29" value="29"/>
+		<item caption="30" value="30"/>
+		<item caption="31" value="31"/>
+		<item caption="32" value="32"/>
+		<item caption="33" value="33"/>
+		<item caption="34" value="34"/>
+		<item caption="35" value="35"/>
+		<item caption="36" value="36"/>
+		<item caption="37" value="37"/>
+		<item caption="38" value="38"/>
+		<item caption="39" value="39"/>
+		<item caption="40" value="40"/>
+		<item caption="41" value="41"/>
+		<item caption="42" value="42"/>
+		<item caption="43" value="43"/>
+		<item caption="44" value="44"/>
+		<item caption="45" value="45"/>
+		<item caption="46" value="46"/>
+		<item caption="47" value="47"/>
+		<item caption="48" value="48"/>
+		<item caption="49" value="49"/>
+		<item caption="50" value="50"/>
+		<item caption="51" value="51"/>
+		<item caption="52" value="52"/>
+		<item caption="53" value="53"/>
+		<item caption="54" value="54"/>
+		<item caption="55" value="55"/>
+		<item caption="56" value="56"/>
+		<item caption="57" value="57"/>
+		<item caption="58" value="58"/>
+		<item caption="59" value="59"/>
+		<item caption="60" value="60"/>
+		<item caption="61" value="61"/>
+		<item caption="62" value="62"/>
+		<item caption="63" value="63"/>
+		<item caption="64" value="64"/>
+		<item caption="65" value="65"/>
+		<item caption="66" value="66"/>
+		<item caption="67" value="67"/>
+		<item caption="68" value="68"/>
+		<item caption="69" value="69"/>
+		<item caption="70" value="70"/>
+		<item caption="71" value="71"/>
+		<item caption="72" value="72"/>
+		<item caption="73" value="73"/>
+		<item caption="74" value="74"/>
+		<item caption="75" value="75"/>
+		<item caption="76" value="76"/>
+		<item caption="77" value="77"/>
+		<item caption="78" value="78"/>
+		<item caption="79" value="79"/>
+		<item caption="80" value="80"/>
+		<item caption="81" value="81"/>
+		<item caption="82" value="82"/>
+		<item caption="83" value="83"/>
+		<item caption="84" value="84"/>
+		<item caption="85" value="85"/>
+		<item caption="86" value="86"/>
+		<item caption="87" value="87"/>
+		<item caption="88" value="88"/>
+		<item caption="89" value="89"/>
+		<item caption="90" value="90"/>
+		<item caption="91" value="91"/>
+		<item caption="92" value="92"/>
+		<item caption="93" value="93"/>
+		<item caption="94" value="94"/>
+		<item caption="95" value="95"/>
+		<item caption="96" value="96"/>
+		<item caption="97" value="97"/>
+		<item caption="98" value="98"/>
+		<item caption="99" value="99"/>
+		<item caption="100" value="100"/>
+	      </combobox>
+	    </frame>
+	  </frame>
+	  <frame layout="vbox">
+	    <frame layout="hbox">
+	      <frame layout="vbox">
+		<label/>
+		<label caption="Korr:"/>
+	      </frame>
+	      <frame layout="vbox">
+		<label caption="Sf:"/>
+		<lineedit name="visus.template.korr.sf.ou" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	      </frame>
+	      <frame layout="vbox">
+		<label caption="Cyl:"/>
+		<lineedit name="visus.template.korr.cyl.ou" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
+	      </frame>
+	      <frame layout="vbox">
+		<label caption="Grader:"/>
+		<lineedit name="visus.template.korr.grader.ou" regexp="|[\d]+" script="lt359gt0" value=""/>
+	      </frame>
+	    </frame>
+	  </frame>
+	</frame>
+      </frame>
+
     <!-- Knapper -->
     <frame layout="hbox">
       <spacer />
diff --git a/server/xml/templates/ref_forunders.xml b/server/xml/templates/ref_forunders.xml
index 61edd8b..368a6e0 100644
--- a/server/xml/templates/ref_forunders.xml
+++ b/server/xml/templates/ref_forunders.xml
@@ -13,6 +13,7 @@
   <macro name="ref_aktuelle" requires="henvisning"/>
 
   <header caption="Objektiv undersøgelse"/>
+  <macro name="visus-template" requires="henvisning"/>
   <macro name="visus-uden_korr" requires="henvisning"/>
   <macro name="egen_brille" requires="henvisning"/>
   <macro name="visus-egen_korr" requires="henvisning"/>
-- 
cgit v1.2.3