data retriever for therapy section, some prescription improvements

svn path=/trunk/; revision=86

diff --git a/globals.sh b/globals.sh
index 3f539ccd5711bd7a1a8fb2d532fcee9fb4708c40..38ae5af3540a6e0000f011bd9bb1b4858f013c69 100755 (executable)
--- a/globals.sh
+++ b/globals.sh
@@ -30,7 +30,7 @@ VCF_FIELDS=(PHOTO LOGO FN NICKNAME SOUND GENDER KIND TITLE ROLE ORG MEMBER CATEG
 
 case "${PROFILE}" in
 medical)
-  data_dirs vcard cache temp mappings prescriptions
+  data_dirs vcard cache temp mappings prescriptions therapies
   [ -z "$NAVIGATION" ] && NAVIGATION=(cards)
 ;;
 circus)

diff --git a/pages/therapy.sh b/pages/therapy.sh
new file mode 100755 (executable)
index 0000000..571333e
--- /dev/null
+++ b/pages/therapy.sh
@@ -0,0 +1,33 @@
+#!/bin/zsh
+
+# Copyright 2016 Paul Hänsch
+#
+# This file is part of Confetti.
+# 
+# Confetti is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# Confetti is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
+
+declare -A tpy
+
+BR='
+'
+
+id="$_GET[id]"
+
+tpyfile="$_DATA/therapies/$id"
+
+mpx=()
+cat "$tpyfile" |while read -r line; do
+  val="${line#*:}"
+  tpy[${line%%:*}]="${val//\\n/$BR}"
+done

diff --git a/templates/prescriptions.css.sh b/templates/prescriptions.css.sh
index f25cc3887d7e416644ee2854faf4ca9c6ea33ee7..91afffa891795ad6a6bdca0eb575e4aae4ab1427 100755 (executable)
--- a/templates/prescriptions.css.sh
+++ b/templates/prescriptions.css.sh
@@ -71,6 +71,8 @@ cat <<EOF
   background-color: #EEE;
   padding: .5ex .25ex;
   white-space: pre-wrap;
+  font-size: .75em;
+  overflow: hidden;
 }
 
 .prescription input[type=checkbox],

diff --git a/templates/text_frame.sh b/templates/text_frame.sh
index 470ced4f651a79675fc5359394ba037a07bb27b5..03eddcdbd85eb3219a56828bd5aceba6b197a49d 100755 (executable)
--- a/templates/text_frame.sh
+++ b/templates/text_frame.sh
@@ -19,6 +19,7 @@ item_name[p_courses]="Kurse"
 item_name[p_email]="Email"
 item_name[p_error]="Fehler"
 item_name[p_categories]="Kategorien"
+item_name[p_prescriptions]="Verschreibungen"
 
 case $PROFILE in
 medical)