From c09b06d5e765955ea41c6b02891390ed6a714e55 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Mon, 1 Oct 2007 15:18:21 +0000
Subject: Now the resume is generated using a format string.

---
 server/xml/example.xml | 28 ++++++++++++++++++++--------
 server/xml/patient.xml |  2 +-
 2 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'server/xml')

diff --git a/server/xml/example.xml b/server/xml/example.xml
index ebef918..57f9587 100644
--- a/server/xml/example.xml
+++ b/server/xml/example.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<macro name="fundus" version="1.0">
+<macro name="example" version="1.0"
+       resume="Det koster 50$$\nLinse: ${linse}D\n${linse_note}\nHævelse: ${radio}\n\n${spl_note}">
   <window name="mainwindow"
           caption="Fundus"
           width="500"
@@ -7,26 +8,37 @@
           layout="vbox">
     <include name="patient"/>
     <frame name="spl_frame" caption="Spl:" layout="vbox">
-      <textedit 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."/>
     </frame>
-    <frame name="linse_frame" caption="Linse:" layout="vbox">
-      <lineedit name="linse" regexp="[0-9]{1,3}D" value="90D"/>
-      <textedit name="linse_note" regexp=".*" value="Der findes centrale atrofiske forandringer."/>
+    <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"/>
+      </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"/>
+      </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"/>
+      </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="exsudater" layout="vbox">
+	<radiobuttons name="radio" value="" layout="vbox">
           <item caption="Radio Randblødning" value="rand"/>
 	  <item caption="Radio Exsudater" value="exsudater"/>
 	  <item caption="Radio Blahblah" value="blabla"/>
         </radiobuttons>
-	<combobox name="combo" value="exsudater">
+	<combobox name="combo" value="fiskesuppe">
           <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="exsudater">
+	<listbox name="list" value="exsudate">
           <item caption="List Randblødning" value="rand"/>
 	  <item caption="List Exsudater" value="exsudater"/>
 	  <item caption="List Blahblah" value="blabla"/>
diff --git a/server/xml/patient.xml b/server/xml/patient.xml
index 3debfb4..8be7e7f 100644
--- a/server/xml/patient.xml
+++ b/server/xml/patient.xml
@@ -5,6 +5,6 @@
     <lineedit name="patient_navn" regexp=".+" value="Birger Fiskenolder"/>
   </frame>
   <frame name="name_frame" caption="Noter" layout="vbox">
-    <textedit name="patient_note" regexp=".*" value="Noget note om et eller andet"/>
+    <lineedit name="patient_note" regexp=".*" value="Noget note om et eller andet"/>
   </frame>
 </macro>
-- 
cgit v1.2.3