From a81f06aa9030d86dd6e4b83eb9f33272be86db20 Mon Sep 17 00:00:00 2001 From: paul Date: Mon, 14 Nov 2016 17:20:36 +0000 Subject: [PATCH] unify client and attendee display templates svn path=/trunk/; revision=149 --- pages/cards.sh | 4 +- templates/{view_attendee.sh => view_card.sh} | 10 +- templates/view_client.sh | 123 ------------------- 3 files changed, 6 insertions(+), 131 deletions(-) rename templates/{view_attendee.sh => view_card.sh} (95%) delete mode 100755 templates/view_client.sh diff --git a/pages/cards.sh b/pages/cards.sh index 945908e..7be33e1 100755 --- a/pages/cards.sh +++ b/pages/cards.sh @@ -30,7 +30,6 @@ case $PROFILE in medical) SUP_FIELDS=(N NICKNAME GENDER BDAY ADR TEL EMAIL X-HEALTH-INSURANCE X-HEALTH-INSURANCE-NOCONTRIB IMPP URL NOTE X-CLIENT-REFERRAL) FORCE_ITEMS=(ADR TEL EMAIL NOTE X-CLIENT-REFERRAL) - view_card="$_EXEC/templates/view_client.sh" _GET[order]="${_GET[order]:-lastname}" _GET[filtertype]="${_GET[filtertype]:-name}" profile_medical=x @@ -38,7 +37,6 @@ medical) circus) SUP_FIELDS=(N NICKNAME GENDER BDAY X-ZACK-JOINDATE X-ZACK-LEAVEDATE EMAIL TEL IMPP ADR URL NOTE) FORCE_ITEMS=(BDAY X-ZACK-JOINDATE TEL EMAIL ADR NOTE) - view_card="$_EXEC/templates/view_attendee.sh" _GET[order]="${_GET[order]:-firstname}" _GET[filtertype]="${_GET[filtertype]:-any}" profile_circus=x @@ -254,7 +252,7 @@ view_card() { #Parameter: Cardfile else declare -A values vcf_parse "$cardfile" - . $view_card |tee "$cachefile" + . "$_EXEC/templates/view_card.sh" |tee "$cachefile" fi } diff --git a/templates/view_attendee.sh b/templates/view_card.sh similarity index 95% rename from templates/view_attendee.sh rename to templates/view_card.sh index 10cb06e..3319e07 100755 --- a/templates/view_attendee.sh +++ b/templates/view_card.sh @@ -59,13 +59,13 @@ for n in NICKNAME NICKNAME{0..100}; do done [ -n "$values[BDAY]" ] && printf ' - *:%s + *: %s ' "$(htmlsafe "$values[BDAY]")" [ -n "$values[X-ZACK-JOINDATE]" ] && printf ' - %s:%s + %s: %s ' "$(l10n label_join)" "$(htmlsafe "$values[X-ZACK-JOINDATE]")" [ -n "$values[X-ZACK-LEAVEDATE]" ] && printf ' - %s:%s + %s:%s ' "$(l10n label_leave)" "$(htmlsafe "$values[X-ZACK-LEAVEDATE]")" [ -n "$values[SOUND]" ] && printf ' @@ -105,9 +105,9 @@ elif [ "$PROFILE" = medical ]; then printf '

%s

' "$(l10n X-HEALTH-INSURANCE)" [ -n "$hi_company" ] && printf '%s' \ "$(htmlsafe "$hi_company")" - [ -n "$hi_number" ] && printf '%s' \ + [ -n "$hi_number" ] && printf ' %s' \ "$(l10n hi_number)" "$(htmlsafe "$hi_number")" - [ -n "$hi_status" ] && printf '%s' \ + [ -n "$hi_status" ] && printf ' %s' \ "$(l10n hi_status)" "$(htmlsafe "$hi_status")" printf '
' diff --git a/templates/view_client.sh b/templates/view_client.sh deleted file mode 100755 index 0fe5e98..0000000 --- a/templates/view_client.sh +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 2014 - 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 . - -list_items(){ - item="$1" - [ -n "${values[$item]+x}" ] && \ - printf '

%s

\n' "$(l10n $item)" - for n in "$item" "$item"{0..100}; do - [ -z "${values[$n]+x}" ] && break \ - || printf '%s\n' \ - "$item" "$(htmlsafe ${values[$n]})" - done -} - -list_section(){ - printf '
' "$1" - shift 1 - for each in $@; do - list_items "$each" - done - printf '
' -} - -n=$(printf %s "$values[N+3] $values[N+1] $values[N+2] $values[N+0] $values[N+4]" \ - | sed -r ':X;$!{N;bX}; s;^[\n ]+;;; s;[\n ]+$;;; s;[\r\t\n ]+; ;g;' - ) -fullname="${n:-${values[FN]:-${values[NICKNAME]}}}" - -hi_company="${values[X-HEALTH-INSURANCE+0]}" - hi_number="${values[X-HEALTH-INSURANCE+1]}" - hi_status="${values[X-HEALTH-INSURANCE+2]}" - -printf '
-

%s

-' "$fullname" -[ -n "$values[GENDER]" ] && printf ' - %s - ' "$(l10n "$values[GENDER]")" - -for n in NICKNAME NICKNAME{0..100}; do - [ -z "${values[$n]+x}" ] && break \ - || printf ' - aka. %s - ' "$(htmlsafe ${values[$n]})" -done - -[ -n "$values[BDAY]" ] && printf ' - *:%s - ' "$(htmlsafe "$values[BDAY]")" -[ -n "$values[X-ZACK-JOINDATE]" ] && printf ' - %s:%s - ' "$(l10n label_join)" "$(htmlsafe "$values[X-ZACK-JOINDATE]")" -[ -n "$values[X-ZACK-LEAVEDATE]" ] && printf ' - %s:%s - ' "$(l10n label_leave)" "$(htmlsafe "$values[X-ZACK-LEAVEDATE]")" - -[ -n "$values[SOUND]" ] && printf ' - ' "$values[SOUND]" - -[ -n "$values[PHOTO]" ] && printf ' - - ' "${values[PHOTO_TYPE]}" "${values[PHOTO]}" - -[ -n "$values[LOGO]" ] && printf ' - - ' "${values[LOGO_TYPE]}" "${values[LOGO]}" - -list_items ADR -list_items URL -printf '
' - - list_section phone TEL EMAIL IMPP - -cat <<-END_HTML -
-

$(l10n X-HEALTH-INSURANCE)

- ${hi_company:+${hi_company}} - ${hi_number:+ ${hi_number}} - ${hi_status:+ ${hi_status}} -
-END_HTML - -list_section note NOTE X-CLIENT-REFERRAL - -cat <<-END_HTML -
-

$(l10n prescriptions)

-
    - $(declare -A mpx - find "$_DATA/prescriptions/" -name "${id%.vcf}.*.mpx" \ - | while read pfile; do - mpx=(); cat "$pfile" |while read -r line; do - val="${line#*:}" - mpx[${line%%:*}]="$(htmlsafe "${val//\\n/$BR}")" - done - printf '
  • %s: %s - %s
    • ' \ - "${id}" "${pfile##*/}" "${mpx[date]}" "${mpx[indicator]}" \ - "$([ -n "${mpx[remidy]}" ] && printf '%s %s' "${mpx[quantity]}" "${mpx[remidy]}" - for n in {0..10}; do - [ -n "${mpx[remidy${n}]}" ] && printf ', %s %s' "${mpx[quantity${n}]}" "${mpx[remidy${n}]}" - done - )" - done |sort -r - ) -
-
-END_HTML -- 2.39.2