Almost done with ref_tremaanederskontrol. Konklusion still not done though

2 files changed, 29 insertions, 17 deletions

diff --git a/server/xml/macros/tonometri-1.0.xml b/server/xml/macros/tonometri-1.0.xml
index 189bdad..b2e6c82 100644
--- a/server/xml/macros/tonometri-1.0.xml
+++ b/server/xml/macros/tonometri-1.0.xml
@@ -153,13 +153,13 @@
     </frame>
 
     <frame name="device_frame" layout="vbox">
-      <label caption="Tonometer måling foretaget med:"/>
+      <label caption="Tonometri foretaget med:"/>
       <combobox name="tonometri.method" value="">
-	<item caption="Lufttonometer" value="Lufttonometri"/>
-	<item caption="Applanationstonometer" value="Applanationstonometri"/>
-	<item caption="Eye Care" value="Eye Care tonometri"/>
-	<item caption="Autonometri" value="Autonometri"/>
-	<item caption="Palpatorisk tonometri" value="Palpatorisk tonometri"/>
+	<item caption="Lufttonometri" value="Lufttonometri"/>
+	<item caption="Applanationstonometri" value="Applanationstonometri"/>
+	<item caption="Eye Care tonometri" value="Eye Care tonometri"/>
+	<item caption="Autotonometri" value="Autotonometri"/>
+	<item caption="Palpatorisk teknik" value="Palpatorisk teknik"/>
       </combobox>
     </frame>
     
diff --git a/server/xml/macros/visus-1.0.xml b/server/xml/macros/visus-1.0.xml
index 963a234..0a7cdf0 100644
--- a/server/xml/macros/visus-1.0.xml
+++ b/server/xml/macros/visus-1.0.xml
@@ -26,20 +26,30 @@
       then
         out = out .. 'Visus o.dxt. ' .. getValue('snellen.right') .. '\n'
         out = out .. 'ETDRS o.dxt. ' .. getValue('etdrs.right') .. '\n'
-        out = out .. 'Korr.: ' .. getValue('snellen.right.corr.basis') .. ' add '
-            .. getValue('snellen.right.corr.sph') .. ' sf, '
-            .. getValue('snellen.right.corr.cyl') .. ' sph '
-            .. getValue('snellen.right.corr.axis') .. ' grader.\n'
+        if ( getValue('snellen.right.corr.basis') ~= 'Ingen' )
+        then
+          out = out .. 'Korr.: ' .. getValue('snellen.right.corr.basis') .. ' add '
+        else
+          out = out .. 'Korr.: add '
+        end
+        out = out .. getValue('snellen.right.corr.sph') .. ' sf, '
+                  .. getValue('snellen.right.corr.cyl') .. ' sph '
+                  .. getValue('snellen.right.corr.axis') .. ' grader.\n'
       end
   
       if ( getValue('snellen.left.missing') == '' )
       then
         out = out .. 'Visus o.sin. ' .. getValue('snellen.left') .. '\n'
         out = out .. 'ETDRS o.sin. ' .. getValue('etdrs.left') .. '\n'
-        out = out .. 'Korr.: ' .. getValue('snellen.left.corr.basis') .. ' add '
-            .. getValue('snellen.left.corr.sph') .. ' sf, '
-            .. getValue('snellen.left.corr.cyl') .. ' sph '
-            .. getValue('snellen.left.corr.axis') .. ' grader.\n'
+        if ( getValue('snellen.left.corr.basis') ~= 'Ingen' )
+        then
+          out = out .. 'Korr.: ' .. getValue('snellen.left.corr.basis') .. ' add '
+        else
+          out = out .. 'Korr.: add '
+        end
+        out = out .. getValue('snellen.left.corr.sph') .. ' sf, '
+                  .. getValue('snellen.left.corr.cyl') .. ' sph '
+                  .. getValue('snellen.left.corr.axis') .. ' grader.\n'
       end
     end
     return out
@@ -180,6 +190,7 @@
 	      <item caption="2,0" value="2,0"/>
 	      <item caption="1,6" value="1,6"/>
 	      <item caption="1,33" value="1,33"/>
+	      <item caption="1,25" value="1,25"/>
 	      <item caption="1,0" value="1,0"/>
 	      <item caption="0,8" value="0,8"/>
 	      <item caption="0,67" value="0,67"/>
@@ -327,9 +338,9 @@
 	    <frame layout="vbox">
 	      <label caption="Basis:"/>
 	      <combobox name="snellen.right.corr.basis" value="">
-		<item caption="Autoref." value="autoref"/>
-		<item caption="Egen brille" value="brille"/>
-		<item caption="Ingen" value="ingen"/>
+		<item caption="Autoref." value="Autoref"/>
+		<item caption="Egen brille" value="Brille"/>
+		<item caption="Ingen" value="Ingen"/>
 	      </combobox>
 	    </frame>
 	    <frame layout="vbox">
@@ -368,6 +379,7 @@
 	      <item caption="2,0" value="2,0"/>
 	      <item caption="1,6" value="1,6"/>
 	      <item caption="1,33" value="1,33"/>
+	      <item caption="1,25" value="1,25"/>
 	      <item caption="1,0" value="1,0"/>
 	      <item caption="0,8" value="0,8"/>
 	      <item caption="0,67" value="0,67"/>