Merge branch 'feature/#3_accounting_dialog' into develop

# Conflicts:
#	billard/models.py
#	billard/views.py
This commit is contained in:
2017-03-09 20:52:12 +01:00
12 changed files with 148 additions and 36 deletions

View File

@@ -23,6 +23,7 @@ class IndexView(generic.ListView):
return ('billard/locationdata_list_ajax.html',)
return super().get_template_names()
class LocationDataDetailView(DetailView):
model = LocationData
@@ -32,6 +33,26 @@ class LocationDataDetailView(DetailView):
return super().get_template_names()
@login_required
def accountmodalview(request):
try:
account = Accounting.objects.filter(reporter_uuid=Client.objects.get(report_user=request.user).uuid).first
except Client.DoesNotExist:
account = None
context = {
'account': account
}
return render(request, 'billard/accountmodal.html', context=context)
@login_required
def accountmodalconfirmview(request, pk):
account = Accounting.objects.get(pk=pk)
account.reporter_uuid = None
account.save()
return redirect('carom_index')
@login_required
def index(request):
if request.method == 'GET':