s4
changeset 921:7b887bea6ecd
Team.csv with gecos names
| author | HIROSE Yuuji <yuuji@gentei.org> |
|---|---|
| date | Tue, 12 Jan 2021 12:30:02 +0900 |
| parents | 7149f283294b |
| children | 9b3f0dc4070b |
| files | s4-blog.sh s4-funcs.sh |
| diffstat | 2 files changed, 15 insertions(+), 8 deletions(-) [+] |
line diff
1.1 --- a/s4-blog.sh Sun Jan 10 10:13:44 2021 +0900 1.2 +++ b/s4-blog.sh Tue Jan 12 12:30:02 2021 +0900 1.3 @@ -1122,20 +1122,28 @@ 1.4 getteamcsv() { 1.5 gid=`numericalize "$1"` 1.6 grp=`getgroupbyid "$gid"` 1.7 - err gid=$gid grp=$grp 1.8 + extra="$2" 1.9 + err "gid=$gid grp=$grp extra=$extra" 1.10 if ! isgrpowner "$user" "$grp"; then 1.11 contentytpe 'text/plain; charset="utf-8"'; echo 1.12 echo "管理者メンバー以外は利用できません。" | html p; return 1.13 fi 1.14 - fn="team-$gid.csv" 1.15 - csv="$tmpd/$fn" 1.16 + fn="Team-$gid" 1.17 + case "$extra" in 1.18 + "") ;; 1.19 + name) 1.20 + fn=${fn}-with-name 1.21 + xSQL=", 1.22 + substr(user, 1, instr(user, '@')-1) \"uname\", 1.23 + coalesce((SELECT gecos FROM gecoses WHERE name=user), user) gecos" ;; 1.24 + esac 1.25 + csv="$tmpd/$fn.csv" 1.26 err csv=$csv 1.27 # We can leave csv mode here because this scripts will exit soon 1.28 - query <<-EOF 1.29 + query <<-EOF > "$csv" 1.30 .mode csv 1.31 .head 1 1.32 - .output $csv 1.33 - SELECT val "ルーム名を事前割り当て", user "メールアドレス" 1.34 + SELECT val "ルーム名を事前割り当て", user "メールアドレス" $xSQL 1.35 FROM grp_mem_m 1.36 WHERE key='team' 1.37 AND gname=(SELECT gname FROM grp WHERE rowid=$gid) 1.38 @@ -1144,7 +1152,6 @@ 1.39 contenttype 'text/plain; charset="utf-8"' 1.40 echo "Content-Disposition: filename=\"$fn\"" 1.41 echo "Content-Length: " `cat $csv | wc -c`; echo 1.42 - #echo "Content-Type: " ${type#file:}; echo 1.43 cat $csv 1.44 exit 1.45 }
2.1 --- a/s4-funcs.sh Sun Jan 10 10:13:44 2021 +0900 2.2 +++ b/s4-funcs.sh Tue Jan 12 12:30:02 2021 +0900 2.3 @@ -3184,7 +3184,7 @@ 2.4 myhexteams=$(hexteams "$grp" "$user") 2.5 fi 2.6 if [ -n "$isowner" -a -n "$allhexteams" ]; then 2.7 - gettingcsv="<p>Download: <a href=\"?getteamcsv+$grid\">Team.csv</a> (Zoom Breakout Room 事前割り当てに使えます)</p>" 2.8 + gettingcsv="<p>Download: <a href=\"?getteamcsv+$grid\">Team.csv</a> (Zoom Breakout Room 事前割り当てに使えます), <a href=\"?getteamcsv+$grid+name\">Team-with-name.csv</a>(参照用名前付)</p>" 2.9 fi 2.10 if [ -n "$myhexteams" ]; then 2.11 rmteammsg="`cgi_radio rm rmteam 'id=\"cmrmteam\"'`<label accesskey=\"s\"