diff --git a/call.cgi b/call.cgi index 5d8e3fe..b38aa63 100755 --- a/call.cgi +++ b/call.cgi @@ -78,7 +78,7 @@ maildb[id_]["no"], maildb[id_]["name"], # 7 8 maildb[id_]["reading"], maildb[id_]["dep"]]) - elif action.startswith("reject") and candidate: + elif action.startswith("reject") and candidate: # exclude double-login reject = True candidate.pop() elif action.startswith("shutdown") and candidate: @@ -110,7 +110,7 @@ wb = load_workbook("./attendancebook_template.xlsx") - lines.sort(lambda x,y: cmp(x[6],y[6])) + lines.sort(lambda x,y: cmp(x[4]+x[1],y[4]+y[1])) for room in ["GRL", "ML1", "ML2", "HSJ"]: wb.remove(wb[room+u"出席表"]) if room in form: