Netforce-Customized
/
clinic
mirror of https://dev.netforce.co.th/netforce-customized/clinic.git
3
0
Fork 0
Code Issues 3 Packages Projects Releases Wiki Activity

schedule

conv_bal
watcha.h 2014-11-27 09:56:32 +07:00
parent 66a0901fdb
commit 1696c488d5
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netforce_clinic/models/schedule_board.py
View File

@ -60,7 +60,7 @@ class ScheduleBoard(Model):
line=empty_line.copy() line=empty_line.copy()
date=schedule.date date=schedule.date
line['schedule_id']=schedule.id 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) lines.append(line)
for line in schedule.lines: for line in schedule.lines:
nurse=line.nurse_id nurse=line.nurse_id
@ -85,9 +85,10 @@ class ScheduleBoard(Model):
has_duration=False has_duration=False
if date_from != date_to: if date_from != date_to:
has_duration=True has_duration=True
date=utils.date2thai(date_from,format='ประจำวัน%(Td)s ที่ %(d)s %(Tm)s %(BY)s')
data={ data={
'lines': lines, 'lines': lines,
'date': utils.date2thai(date_from,format='ประจำวัน%(Td)s ที่ %(d)s %(Tm)s %(BY)s'), 'date': date,
'company_name': company.name, 'company_name': company.name,
'company_parent_name': company.parent_id.name, 'company_parent_name': company.parent_id.name,
'has_duration': has_duration, 'has_duration': has_duration,

BIN
netforce_clinic/reports/schedule_board.xlsx
View File

Binary file not shown.

2
netforce_clinic/templates/schedule_board.hbs
View File

@ -23,7 +23,7 @@
{{#each lines}} {{#each lines}}
<tr> <tr>
{{#if title}} {{#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> <td style="background-color:#ddddff" colspan="5"></td>
{{else}} {{else}}
<td style="background-color:{{cycle_color}}">{{cycle_name}}</td> <td style="background-color:{{cycle_color}}">{{cycle_name}}</td>