Merge with local code.

3 files changed, 21 insertions, 9 deletions

diff --git a/server/xml/commit.xml b/server/xml/commit.xml
new file mode 100644
index 0000000..0e9ff86
--- /dev/null
+++ b/server/xml/commit.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<commit name="test_macro" cpr="1505050505" version="1.0">
+  <field name="visus_subjective" value="2.85"/>
+  <field name="visus_objective" value="2.91"/>
+  <field name="eye" value="osin"/>
+</commit>
diff --git a/server/xml/example.xml b/server/xml/example.xml
index 3273d71..b9974a8 100644
--- a/server/xml/example.xml
+++ b/server/xml/example.xml
@@ -8,37 +8,37 @@
           layout="vbox">
     <include name="patient"/>
     <frame name="spl_frame" caption="Spl:" layout="vbox">
-      <lineedit name="spl_note" regexp=".*" value="På begge sider alderssvarende forhold. Der er let katarakt, som dog ikke er operationskrævende."/>
+      <lineedit name="spl_note" regexp=".*" value="På begge sider alderssvarende forhold. Der er let katarakt, som dog ikke er operationskrævende." help="Hjælpenisse"/>
     </frame>
     <frame name="linse_frame" caption="Linser:" layout="vbox">
       <frame name="linse_framea" layout="hbox">
         <label name="a" width="300" caption="Linse1 er en lidt længere streng end de to andre:"/>
-        <lineedit name="linse1" regexp="[0-9]{1,3}D" value="90K"/>
+        <lineedit name="linse1" regexp="[0-9]{1,3}D" value="90K" help="Hjælpenisse"/>
       </frame>
       <frame name="linse_frameb" layout="hbox">
         <label name="b" width="300" caption="Linse2:"/>
-        <lineedit name="linse2" regexp="[0-9]{1,3}D" value="90D"/>
+        <lineedit name="linse2" regexp="[0-9]{1,3}D" value="90D" help="Hjælpenisse"/>
       </frame>
       <frame name="linse_framec" layout="hbox">
         <label name="c" width="300" caption="Linse3:"/>
-        <lineedit name="linse3" regexp="[0-9]{1,3}D" value="90D"/>
+        <lineedit name="linse3" regexp="[0-9]{1,3}D" value="90D" help="Hjælpenisse"/>
       </frame>
     </frame>
     <frame name="swelling_frame" layout="hbox">
       <label name="swelling" caption="Der findes central hævelse med:"/>
       <frame name="swelling_radios" layout="hbox">
-	<radiobuttons name="radio" value="" layout="vbox">
+	<radiobuttons name="radio" value="" layout="vbox" help="Hjælpenisse">
           <item caption="Radio Randblødning" value="rand"/>
 	  <item caption="Radio Exsudater" value="exsudater"/>
 	  <item caption="Radio Blahblah" value="blabla"/>
         </radiobuttons>
-	<combobox name="combo" value="fiskesuppe">
+	<combobox name="combo" value="fiskesuppe" help="Hjælpenisse">
           <item caption="Combo Randblødning" value="rand"/>
 	  <item caption="Combo Exsudater" value="exsudater"/>
 	  <item caption="Combo Blahblah" value="blabla"/>
 	  <item caption="Combo Blahblah" value="fisk"/>
         </combobox>
-	<listbox name="list" value="exsudate">
+	<listbox name="list" value="exsudate" help="Hjælpenisse">
           <item caption="List Randblødning" value="rand"/>
 	  <item caption="List Exsudater" value="exsudater"/>
 	  <item caption="List Blahblah" value="blabla"/>
@@ -46,8 +46,10 @@
       </frame>
     </frame>
     <frame name="buttons" layout="hbox">
-      <button name="cancel" caption="Annuller" action="cancel"/>
-      <button name="commit" caption="Godkend" action="commit"/>
+      <lineedit name="next_macro" regexp="[a-z_]+[a-z_0-9]*" value="example"/>
+      <button name="cancel" caption="Annuller" action="cancel" help="Hjælpenisse"/>
+      <button name="continue" caption="Fortsæt" action="continue" field="next_macro" help="Hjælpenisse"/>
+      <button name="commit" caption="Godkend" action="commit" help="Hjælpenisse"/>
     </frame>
   </window>
 </macro>
diff --git a/server/xml/request.xml b/server/xml/request.xml
new file mode 100644
index 0000000..369d5ea
--- /dev/null
+++ b/server/xml/request.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<request cpr="1505050505" version="1.0">
+  <macro name="example"/>
+</request>