Skip to content

Commit 87250f4

Browse files
committed
few fixes
1 parent 6243686 commit 87250f4

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

api/serializers/payment_serializer.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,15 @@ class Meta:
137137
exclude = ()
138138
fields = ('employee', )
139139

140+
class PayrollPeriodGetDateSerializer(serializers.ModelSerializer):
141+
payments = PayrollPeriodPaymentEmployeeSerializer(read_only=True, many=True)
142+
class Meta:
143+
model = PayrollPeriod
144+
fields = (
145+
'id',
146+
'starting_at',
147+
'ending_at',
148+
)
140149
class PayrollPeriodGetTinySerializer(serializers.ModelSerializer):
141150
payments = PayrollPeriodPaymentEmployeeSerializer(read_only=True, many=True)
142151
class Meta:

api/views/employer_views.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ def get(self, request, period_id=None):
976976
else:
977977

978978
periods = PayrollPeriod.objects.filter(employer_id=self.employer.id)
979-
979+
print('hello world')
980980
qStart = request.GET.get('start')
981981
if qStart is not None and qStart != '':
982982
start = timezone.make_aware(datetime.datetime.strptime(qStart, DATE_FORMAT))
@@ -989,7 +989,10 @@ def get(self, request, period_id=None):
989989

990990
defaultSerializer = payment_serializer.PayrollPeriodGetTinySerializer
991991

992-
992+
qReports = request.GET.get('reports')
993+
if qReports is not None and qReports == True:
994+
defaultSerializer = payment_serializer.PayrollPeriodGetDateSerializer
995+
993996
serializer = defaultSerializer(periods.order_by('-starting_at'), many=True)
994997
return Response(serializer.data, status=status.HTTP_200_OK)
995998

0 commit comments

Comments
 (0)