diff --git a/call.cgi b/call.cgi index bf8442a..94ec64f 100755 --- a/call.cgi +++ b/call.cgi @@ -93,7 +93,7 @@ # 5 6 dd[0], dd[1], # 7 8 - dd[2], dd[3], dd[4], "OK"]) + dd[2], dd[3], dd[4], ""]) else: candidate.append( # 0 1 2 3 4 @@ -101,7 +101,7 @@ # 5 6 "????", id_, # 7 8 - "--", "--", "--", "OK"]) + "--", "--", "--", ""]) elif action.startswith("reject") and candidate: # exclude double-login action, id_, host = action.split(":") @@ -142,7 +142,7 @@ # 5 6 dd[0], dd[1], # 7 8 - dd[2], dd[3], dd[4], "OK"]) + dd[2], dd[3], dd[4], ""]) else: candidate.append( # 0 1 2 3 4 @@ -150,7 +150,7 @@ # 5 6 "????", id_, # 7 8 - "--", "--", "--", "OK"]) + "--", "--", "--", ""]) lines.extend(candidate) @@ -272,6 +272,7 @@ showLastColumn=False, showRowStripes=True, showColumnStripes=False) tab.tableStyleInfo = style ws.add_table(tab) + ws.column_dimension['H'].hidden = True else: wb.remove(wb[room+"座席表"]) diff --git a/index.html b/index.html index f95038a..8f8bee8 100644 --- a/index.html +++ b/index.html @@ -131,11 +131,11 @@ onclick='clicked()' id='dep' name='sort' value='所属'> - + @@ -287,7 +287,7 @@ if (a[i] > b[i]) return 1*direction; if (a[i] < b[i]) return -1*direction; return 0; -}; + }; } function clicked() { s = $("input[name=sort]:checked").val(); @@ -307,8 +307,6 @@ db = db.sort(check(0)); }else if (s == "所属") { db = db.sort(check(8)); - }else if (s == "ステータス") { - db = db.sort(check(10)); } else return; filter(); @@ -360,12 +358,12 @@ } if (accept) { if(!checkbox["uniq"] || prev != s[4]) { - if (s[10] === "OK") { + if (s[10] === "") { var tr = $("").appendTo(table); } else { var tr = $("").appendTo(table); } - [1,5,6,7,0,8,10].forEach(function(i) {$(""+s[i]+"").appendTo(tr); }); + [1,5,6,7,0,8].forEach(function(i) {$(""+s[i]+"").appendTo(tr); }); if (s[9] === "01") { n_student += 1; } else {