Mercurial > hgrepos > hgweb.cgi > s4
changeset 921:7b887bea6ecd draft
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 wrap: on
line diff
--- a/s4-blog.sh Sun Jan 10 10:13:44 2021 +0900 +++ b/s4-blog.sh Tue Jan 12 12:30:02 2021 +0900 @@ -1122,20 +1122,28 @@ getteamcsv() { gid=`numericalize "$1"` grp=`getgroupbyid "$gid"` - err gid=$gid grp=$grp + extra="$2" + err "gid=$gid grp=$grp extra=$extra" if ! isgrpowner "$user" "$grp"; then contentytpe 'text/plain; charset="utf-8"'; echo echo "管理者メンバー以外は利用できません。" | html p; return fi - fn="team-$gid.csv" - csv="$tmpd/$fn" + fn="Team-$gid" + case "$extra" in + "") ;; + name) + fn=${fn}-with-name + xSQL=", + substr(user, 1, instr(user, '@')-1) \"uname\", + coalesce((SELECT gecos FROM gecoses WHERE name=user), user) gecos" ;; + esac + csv="$tmpd/$fn.csv" err csv=$csv # We can leave csv mode here because this scripts will exit soon - query <<-EOF + query <<-EOF > "$csv" .mode csv .head 1 - .output $csv - SELECT val "ルーム名を事前割り当て", user "メールアドレス" + SELECT val "ルーム名を事前割り当て", user "メールアドレス" $xSQL FROM grp_mem_m WHERE key='team' AND gname=(SELECT gname FROM grp WHERE rowid=$gid) @@ -1144,7 +1152,6 @@ contenttype 'text/plain; charset="utf-8"' echo "Content-Disposition: filename=\"$fn\"" echo "Content-Length: " `cat $csv | wc -c`; echo - #echo "Content-Type: " ${type#file:}; echo cat $csv exit }
--- a/s4-funcs.sh Sun Jan 10 10:13:44 2021 +0900 +++ b/s4-funcs.sh Tue Jan 12 12:30:02 2021 +0900 @@ -3184,7 +3184,7 @@ myhexteams=$(hexteams "$grp" "$user") fi if [ -n "$isowner" -a -n "$allhexteams" ]; then - gettingcsv="<p>Download: <a href=\"?getteamcsv+$grid\">Team.csv</a> (Zoom Breakout Room 事前割り当てに使えます)</p>" + gettingcsv="<p>Download: <a href=\"?getteamcsv+$grid\">Team.csv</a> (Zoom Breakout Room 事前割り当てに使えます), <a href=\"?getteamcsv+$grid+name\">Team-with-name.csv</a>(参照用名前付)</p>" fi if [ -n "$myhexteams" ]; then rmteammsg="`cgi_radio rm rmteam 'id=\"cmrmteam\"'`<label accesskey=\"s\"
