schedule

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,

netforce_clinic/templates/schedule_board.hbs

@@ -23,7 +23,7 @@
         {{#each lines}}
             <tr>
                 {{#if title}}
-                    <td style="background-color:#ddddff"><a href="/ui#name=clinic_schedule&active_id={{schedule_id}}&mode=form">{{schedule_name}}</a></td>
+                    <td style="background-color:#ddddff"><a href="/ui#name=clinic_schedule&active_id={{schedule_id}}&mode=form"><b>{{schedule_name}}</b></a></td>
                     <td style="background-color:#ddddff" colspan="5"></td>
                 {{else}}
                     <td style="background-color:{{cycle_color}}">{{cycle_name}}</td>