diff --git a/call.cgi b/call.cgi index 8b8e0d6..df7868c 100755 --- a/call.cgi +++ b/call.cgi @@ -119,7 +119,7 @@ active = False candidate[-1][2] = date.strftime(datefmt) candidate[-1][1] += "〜"+date.strftime(datefmt) - elif fr < date : # no candidate + elif fr < date and fr + timedelta(hours=2) > date: # no candidate to_entry = date.strftime(datefmt) entry = "?〜" + date.strftime(datefmt) res = c.execute(query, (id_,)) @@ -165,6 +165,7 @@ wb.remove(wb[room+u"出席表"]) if room in form: ws = wb.create_sheet(title = room+u"出席表") + ws.sheet_properties.pageSetUpPr.fitToPage = True if room == "IML": prefix = "HSJ" else: @@ -176,7 +177,7 @@ ws.column_dimensions["A"].width =9.0; ws.column_dimensions["B"].width =11.0; ws.column_dimensions["C"].width =6.0; ws.column_dimensions["D"].width =6.0; ws.column_dimensions["E"].width =15.0; ws.column_dimensions["F"].width =18.0; - ws.column_dimensions["G"].width =7.0; # setup width of each columns + ws.column_dimensions["G"].width =20.0; # setup width of each columns ws.append(["学生", "","","", fr.strftime("%Y/%m/%d"), fr.strftime("%H:%M")+"〜"+ to.strftime("%H:%M")]) ws.append(["ホスト名", "学籍番号", "開始", "終了", "名前", "よみ", "所属"])