DGNum/gestioCOF
14
2
Fork 2
Code Issues 78 Pull requests 18 Projects Releases 12 Packages Wiki Activity Actions

WIP: Aureplop/kpsul js refactor #501

Draft
delobell wants to merge 215 commits from aureplop/kpsul_js_refactor into master
pull from: aureplop/kpsul_js_refactor
merge into: DGNum:master
Conversation 55 Commits 215 Files changed 19 +17 -12
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 02a015e633 - Show all commits

9
kfet/views.py
View file

@ -1799,22 +1799,27 @@ def perform_transfers(request):
websocket_data['opegroups'] = [{ websocket_data['opegroups'] = [{
'add': True, 'add': True,
'modelname': 'transfergroup', 'modelname': 'transfergroup',
'content': {
'id': transfergroup.pk, 'id': transfergroup.pk,
'at': transfergroup.at, 'at': transfergroup.at,
'comment': transfergroup.comment, 'comment': transfergroup.comment,
'valid_by__trigramme': (transfergroup.valid_by and 'valid_by__trigramme': (transfergroup.valid_by and
transfergroup.valid_by.trigramme or None), transfergroup.valid_by.trigramme or None),
'opes': [], 'children': []
},
}] }]
for transfer in transfers: for transfer in transfers:
ope_data = { ope_data = {
'modelname': 'transfer',
'content': {
'id': transfer.pk, 'id': transfer.pk,
'amount': transfer.amount, 'amount': transfer.amount,
'from_acc': transfer.from_acc.trigramme, 'from_acc': transfer.from_acc.trigramme,
'to_acc': transfer.to_acc.trigramme, 'to_acc': transfer.to_acc.trigramme,
'canceled_by__trigramme': None, 'canceled_at': None, 'canceled_by__trigramme': None, 'canceled_at': None,
},
} }
websocket_data['opegroups'][0]['opes'].append(ope_data) websocket_data['opegroups'][0]['content']['children'].append(ope_data)
consumers.KPsul.group_send('kfet.kpsul', websocket_data) consumers.KPsul.group_send('kfet.kpsul', websocket_data)
return JsonResponse(data) return JsonResponse(data)