devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix report

This commit is contained in:
eslamabady 2024-09-02 16:04:35 +03:00
parent 426f150b42
commit f2b89b9251
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
odex25_hr/attendances/report/employee_attendances_report_template.xml
View File

@ -135,46 +135,46 @@
<br/>
<table class="table table-condensed" style="width:100%">
<thead style="width:100%;">
<tr style="width:100%;">
<th style="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: white;color: black;width:10%;text-align:center;">
<tr style="width:100%;text-align:center;">
<th style="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: gray;color: black;width:10%;text-align:center;">
التاريخ
</th>
<th style="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: white;color: black;width:10%;text-align:center;">
<th style="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: gray;color: black;width:10%;text-align:center;">
اليوم
</th>
<th style=" border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: white;color: black;width:5%;text-align:center;">
<th style=" border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: gray;color: black;width:5%;text-align:center;">
وقت الدخول
</th>
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: white;color: black;width:5%;text-align:center;">
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: gray;color: black;width:5%;text-align:center;">
وفت الخروج
</th>
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: white;color: black;width:5%;text-align:center;">
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: gray;color: black;width:5%;text-align:center;">
التأخير
</th>
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: white;color: black;width:5%;text-align:center;">
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: gray;color: black;width:5%;text-align:center;">
التفصير
</th>
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: white;color: black;width:5%;text-align:center;">
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: gray;color: black;width:5%;text-align:center;">
الاضافى
</th>
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: white;color: black;width:10%;text-align:center;">
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: gray;color: black;width:10%;text-align:center;">
ساعات العمل
</th>
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: white;color: black;width:30%;text-align:center;">
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: gray;color: black;width:25%;text-align:center;">
ملاحظة
</th>
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: white;color: black;width:15%;text-align:center;">
<th style=" border: 1px solid gray; padding: 1px;font-size:0.8em;background-color: gray;color: black;width:20%;text-align:center;">
الوردية
</th>
</tr>
</thead>
<tbody>
<t t-foreach="data[key]" t-as="line">
<tr>
<tr style="text-align:center;">
<td style="border: 1px solid gray;padding: 1px; width:10%;font-size:0.8em;background-color: white;color: black; text-align:center">
<t t-esc="line['date']"/>
</td>
<td style="border: 1px solid gray;padding: 1px;font-size:0.8em;background-color: white;color: black;width:10%;text-align:center">
<td style="border: 1px solid gray;padding: 1px;font-size:0.8em;background-color:white;color: black;width:10%;text-align:center">
<t t-esc="line['day']"/>
</td>
<td style="border:1px solid gray;padding: 1px;font-size:0.8em;background-color: white;color: black;width:5%;text-align:center">
@ -219,10 +219,10 @@
<t t-esc="'%02d:%02d' % (int(str(line['office_hours']).split('.')[0]), int(float(str('%.2f' % line['office_hours']).split('.')[1])/100*60))"/>
</td>
<td style="border: 1px solid gray;padding: 1px;font-size:0.8em;background-color: white;color: black;width:30%;text-align:center">
<td style="border: 1px solid gray;padding: 1px;font-size:0.8em;background-color: white;color: black;width:25%;text-align:center">
<t t-esc="line['note']"/>
</td>
<td style="border: 1px solid gray;padding: 1px;font-size:0.8em;background-color: white;color: black;width:15%;text-align:center">
<td style="border: 1px solid gray;padding: 1px;font-size:0.8em;background-color: white;color: black;width:20%;text-align:center">
<t t-esc="line['calendar_id']"/>
</td>
</tr>
@ -235,7 +235,8 @@
مجموع التأخير والتقصير
</td>
<td style=" border: 1px solid gray;padding: 1px;font-size:0.8em;background-color: white;color: black;text-align:center;">
<t t-esc="total[key]['total_late_early']" />
<t t-esc="total[key]['total_late_early'].split('.')[0]" />
</td>
<td style=" border: 1px solid gray;padding: 1px;font-size:0.8em;background-color: white;color: black;text-align:center;">
@ -250,7 +251,7 @@
اجمالى الاضافى
</td>
<td style=" border: 1px solid gray;padding: 1px;font-size:0.8em;background-color: white;color: black;text-align:center;">
<t t-esc="total[key]['total_extra_hours']"/>
<t t-esc="total[key]['total_extra_hours'].split('.')[0]"/>
</td>
<td style=" border: 1px solid gray;padding: 1px;font-size:0.8em;background-color: white;color: black;text-align:center;">
اجمالى الاجازات والانتدابات

2
odex25_hr/attendances/wizard/attendances_report_wiz.py
View File

@ -121,6 +121,7 @@ class ReportAttendancePublic(models.AbstractModel):
'employee_id': resource.employee_id,
'employee_name': resource.employee_id.name,
})
data=sorted(data, key=lambda d: d['date'])
for emp in employees:
list_cat = attendance_transaction_ids.filtered(lambda r: r.employee_id.name == emp)
@ -152,6 +153,7 @@ class ReportAttendancePublic(models.AbstractModel):
key_list.append(key)
mykey = list(dict.fromkeys(key_list))
return final_dic, mykey,total_dic,emp_data_dict
elif type == 'absent':
for resource in attendance_transaction_ids.filtered(lambda r: r.is_absent == True):
data.append({