From 1696c488d5e71e1239eda1bee4fb9b9fc614f335 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Thu, 27 Nov 2014 09:56:32 +0700 Subject: [PATCH] schedule --- netforce_clinic/models/schedule_board.py | 5 +++-- netforce_clinic/reports/schedule_board.xlsx | Bin 5043 -> 5264 bytes netforce_clinic/templates/schedule_board.hbs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) 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 47b0b02c1a7a456edbcc9c91fe2d02d8a457f06e..258a3c77b8df25dc32deb7757a972d07d42837cf 100644 GIT binary patch delta 2851 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 BsQUl_ 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}}