diff --git a/netforce_clinic/models/schedule_board.py b/netforce_clinic/models/schedule_board.py index a6b8848..588d307 100644 --- a/netforce_clinic/models/schedule_board.py +++ b/netforce_clinic/models/schedule_board.py @@ -60,7 +60,7 @@ class ScheduleBoard(Model): line=empty_line.copy() date=schedule.date line['schedule_id']=schedule.id - line['schedule_name']=utils.date2thai(date,format='%(Td)s %(d)s %(Tm)s',lang="th_TH2"), + line['schedule_name']=utils.date2thai(date,format='%(Td)s %(d)s %(Tm)s',lang="th_TH2") lines.append(line) for line in schedule.lines: nurse=line.nurse_id @@ -85,9 +85,10 @@ class ScheduleBoard(Model): has_duration=False if date_from != date_to: has_duration=True + date=utils.date2thai(date_from,format='ประจำวัน%(Td)s ที่ %(d)s %(Tm)s %(BY)s') data={ 'lines': lines, - 'date': utils.date2thai(date_from,format='ประจำวัน%(Td)s ที่ %(d)s %(Tm)s %(BY)s'), + 'date': date, 'company_name': company.name, 'company_parent_name': company.parent_id.name, 'has_duration': has_duration, diff --git a/netforce_clinic/reports/schedule_board.xlsx b/netforce_clinic/reports/schedule_board.xlsx index 47b0b02..258a3c7 100644 Binary files a/netforce_clinic/reports/schedule_board.xlsx and b/netforce_clinic/reports/schedule_board.xlsx differ diff --git a/netforce_clinic/templates/schedule_board.hbs b/netforce_clinic/templates/schedule_board.hbs index 9e83c5e..ed77bae 100644 --- a/netforce_clinic/templates/schedule_board.hbs +++ b/netforce_clinic/templates/schedule_board.hbs @@ -23,7 +23,7 @@ {{#each lines}} {{#if title}} - {{schedule_name}} + {{schedule_name}} {{else}} {{cycle_name}}