added visus fields to manifest_refaktion

1 files changed, 339 insertions, 42 deletions

diff --git a/server/xml/macros/manifest_refraktion-1.0.xml b/server/xml/macros/manifest_refraktion-1.0.xml
index b4cb474..3d481a1 100644
--- a/server/xml/macros/manifest_refraktion-1.0.xml
+++ b/server/xml/macros/manifest_refraktion-1.0.xml
@@ -1,16 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--
-    20081203: Bent Bisballe Nyeng
-    Feltnavnene ændret så de giver mening.
-  -->
-<!--
-    20090108: Bent Bisballe Nyeng
-    Højre/venstre byttet om.
-  -->
-<!--
-    20090202: Bent Bisballe Nyeng
-    'missing eye' tilføjet.
-  -->
 <macro name="manifest_refraktion" version="1.0">
   <resume language="lua">
     out = ''
@@ -20,6 +8,8 @@
       out = out .. 'Højre øje: ' .. getValue('manifest_refraktion.right.sf')
         .. ' sf, ' .. getValue('manifest_refraktion.right.cyl') .. ' x ' 
         .. getValue('manifest_refraktion.right.grader') .. '\n'
+      out = out .. 'Snellen: ' .. getValue('manifest_refraktion.snellen.right') .. '\n'
+      out = out .. 'ETDRS: ' .. getValue('manifest_refraktion.etdrs.right') .. '\n'
     end
 
     if ( getValue('manifest_refraktion.left.missing') == '' )
@@ -27,6 +17,8 @@
       out = out .. 'Venstre øje: ' .. getValue('manifest_refraktion.left.sf')
         .. ' sf, ' .. getValue('manifest_refraktion.left.cyl') .. ' x '
         .. getValue('manifest_refraktion.left.grader') .. '\n'
+      out = out .. 'Snellen: ' .. getValue('manifest_refraktion.snellen.left') .. '\n'
+      out = out .. 'ETDRS: ' .. getValue('manifest_refraktion.etdrs.left') .. '\n'
     end
 
     return out
@@ -117,6 +109,13 @@
         return false
       end
     </script>
+    <script language="lua" name="not0">
+      if(value == 'Ikke udfyldt')
+      then
+        return false
+      end
+      return true
+    </script>
     <script language="lua" name="right_eye">
       if ( value == 'mangler' )
       then
@@ -147,22 +146,171 @@
 		  name="manifest_refraktion.right.missing" script="right_eye"
 		  map="missing_eye_right_map"
 		  truevalue="mangler" falsevalue="" value=""/>
-	<frame name="right_eye_frame" caption="Højre øje" layout="hbox">
-	  
-	  <frame layout="vbox">
-	    <label caption="Sf:"/>
-	    <lineedit name="manifest_refraktion.right.sf" map="manifest_refraktion.right.sphere"
-		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	<frame name="right_eye_frame" caption="Højre øje" layout="vbox">
+	  <frame layout="hbox">
+	    <frame layout="vbox">
+	      <label caption="Snellen:"/>
+	      <altcombobox name="manifest_refraktion.snellen.right" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
+		<item caption="Ikke udfyldt" value="Ikke udfyldt"/>
+		<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"/>
+		<altitem caption="Andet" value="andet" innerwidget="hoejre_snellen_andet" layout="hbox">
+		  <label caption="Andet:"/>
+		  <lineedit name="hoejre_snellen_andet" regexp="[0-9]+(,\d+|\d*)"/>
+		</altitem>
+	      </altcombobox>
+	    </frame>
+	    <frame layout="vbox">
+	      <label caption="ETDRS:"/>
+	      <combobox name="manifest_refraktion.etdrs.right" value="Ikke udfyldt" type="search" script="not0">
+		<item caption="Ikke udfyldt" value="Ikke udfyldt"/>
+		<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>
+	      <spacer/>
+	    </frame>
 	  </frame>
-	  <frame layout="vbox">
-	    <label caption="Cyl:"/>
-	    <lineedit name="manifest_refraktion.right.cyl" map="manifest_refraktion.right.cyl"
-		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
-	  </frame>
-	  <frame layout="vbox">
-	    <label caption="Grader:"/>
-	    <lineedit name="manifest_refraktion.right.grader" map="manifest_refraktion.right.axis"
-		      regexp="[\d]+" script="lt359gt0" value=""/>
+	  
+	  <frame layout="hbox">
+	    <frame layout="vbox">
+	      <label caption="Sf:"/>
+	      <lineedit name="manifest_refraktion.right.sf" map="manifest_refraktion.right.sphere"
+			regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	    </frame>
+	    <frame layout="vbox">
+	      <label caption="Cyl:"/>
+	      <lineedit name="manifest_refraktion.right.cyl" map="manifest_refraktion.right.cyl"
+			regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+	    </frame>
+	    <frame layout="vbox">
+	      <label caption="Grader:"/>
+	      <lineedit name="manifest_refraktion.right.grader" map="manifest_refraktion.right.axis"
+			regexp="[\d]+" script="lt359gt0" value=""/>
+	    </frame>
 	  </frame>
 	</frame>
       </frame>
@@ -173,22 +321,171 @@
 		  name="manifest_refraktion.left.missing" script="left_eye"
 		  map="missing_eye_left_map"
 		  truevalue="mangler" falsevalue="" value=""/>
-	<frame name="left_eye_frame" caption="Venstre øje" layout="hbox">
-	  
-	  <frame layout="vbox">
-	    <label caption="Sf:"/>
-	    <lineedit name="manifest_refraktion.left.sf" map="manifest_refraktion.left.sphere"
-		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	<frame name="left_eye_frame" caption="Venstre øje" layout="vbox">
+	  <frame layout="hbox">
+	    <frame layout="vbox">
+	      <label caption="Snellen:"/>
+	      <altcombobox name="manifest_refraktion.snellen.left" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
+		<item caption="Ikke udfyldt" value="Ikke udfyldt"/>
+		<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"/>
+		<altitem caption="Andet" value="andet" innerwidget="hoejre_snellen_andet" layout="hbox">
+		  <label caption="Andet:"/>
+		  <lineedit name="hoejre_snellen_andet" regexp="[0-9]+(,\d+|\d*)"/>
+		</altitem>
+	      </altcombobox>
+	    </frame>
+	    <frame layout="vbox">
+	      <label caption="ETDRS:"/>
+	      <combobox name="manifest_refraktion.etdrs.left" value="Ikke udfyldt" type="search" script="not0">
+		<item caption="Ikke udfyldt" value="Ikke udfyldt"/>
+		<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>
+	      <spacer/>
+	    </frame>
 	  </frame>
-	  <frame layout="vbox">
-	    <label caption="Cyl:"/>
-	    <lineedit name="manifest_refraktion.left.cyl" map="manifest_refraktion.left.cyl"
-		      regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
-	  </frame>
-	  <frame layout="vbox">
-	    <label caption="Grader:"/>
-	    <lineedit name="manifest_refraktion.left.grader" map="manifest_refraktion.left.axis"
-		      regexp="[\d]+" script="lt359gt0" value=""/>
+	  
+	  <frame layout="hbox">
+	    <frame layout="vbox">
+	      <label caption="Sf:"/>
+	      <lineedit name="manifest_refraktion.left.sf" map="manifest_refraktion.left.sphere"
+			regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	    </frame>
+	    <frame layout="vbox">
+	      <label caption="Cyl:"/>
+	      <lineedit name="manifest_refraktion.left.cyl" map="manifest_refraktion.left.cyl"
+			regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+	    </frame>
+	    <frame layout="vbox">
+	      <label caption="Grader:"/>
+	      <lineedit name="manifest_refraktion.left.grader" map="manifest_refraktion.left.axis"
+			regexp="[\d]+" script="lt359gt0" value=""/>
+	    </frame>
 	  </frame>
 	</frame>
       </frame>