From c2ea455750028e34cfe650ad2267bb5e2e7a6ade Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Thu, 23 Sep 2021 21:04:18 +0000 Subject: [PATCH] Display the recorder of each Transaction --- apiserver/apiserver/api/serializers.py | 7 +++++++ webclient/src/Transactions.js | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py index ac52fb9..bf5f43a 100644 --- a/apiserver/apiserver/api/serializers.py +++ b/apiserver/apiserver/api/serializers.py @@ -66,6 +66,7 @@ class TransactionSerializer(serializers.ModelSerializer): 'User Flagged', ], allow_null=True, required=False) number_of_membership_months = serializers.IntegerField(max_value=36, min_value=-36) + recorder = serializers.SerializerMethodField() class Meta: model = models.Transaction @@ -99,6 +100,12 @@ class TransactionSerializer(serializers.ModelSerializer): member = models.Member.objects.get(id=obj.member_id) return member.preferred_name + ' ' + member.last_name + def get_recorder(self, obj): + if obj.recorder: + return obj.recorder.username + else: + return None + # member viewing other members # hide info for non-vetted members so someone sitting diff --git a/webclient/src/Transactions.js b/webclient/src/Transactions.js index 9ef403a..6778025 100644 --- a/webclient/src/Transactions.js +++ b/webclient/src/Transactions.js @@ -374,6 +374,10 @@ class TransactionTable extends React.Component { Memo: {transaction.memo} + + Recorder: + {transaction.recorder || 'System'} + {!!transaction.report_type && Report Type: