From e7a25888a7ba8a49351db7827d124093af7bda4f Mon Sep 17 00:00:00 2001
From: Alexander Werner <alexander.werner@mawoh.de>
Date: Mon, 6 Mar 2017 20:05:53 +0100
Subject: [PATCH] updated modal code

---
 billard/templates/billard/accountmodal.html |  9 +++------
 billard/urls.py                             |  3 ++-
 billard/views.py                            | 13 +++++++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/billard/templates/billard/accountmodal.html b/billard/templates/billard/accountmodal.html
index 62b2ffd..fe60461 100644
--- a/billard/templates/billard/accountmodal.html
+++ b/billard/templates/billard/accountmodal.html
@@ -1,18 +1,15 @@
-{% if accounts %}
+{% if account %}
 <div id="accountsmodal" class="modal" tabindex="-1" role="dialog">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h4 class="modal-title">Kischte Kischte Kischte</h4>
       </div>
       <div class="modal-body">
-          {% for acc in accounts %}
-        <p>{{ acc.desk }} - {{ acc.time_from }} bis {{ acc.time_to }} - {{ prize }}</p>
-          {% endfor %}
+        <p>{{ account.desk }} - {{ account.time_from }} bis {{ account.time_to }} - {{ account.prize }}</p>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-default" href="{% url 'accountmodalconfirm' account.pk %}">Schliessen</button>
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
diff --git a/billard/urls.py b/billard/urls.py
index c01b3ee..5f22fdc 100644
--- a/billard/urls.py
+++ b/billard/urls.py
@@ -10,5 +10,6 @@ urlpatterns = [
     url(r'^(?P<pk>[0-9]+)/$', views.LocationDataDetailView.as_view(), name='detail'),
     url(r'api/v1/', include(router.urls)),
     url(r'process_locationdata', views.process_locationdata, name='process_locationdata'),
-    url(r'accountmodal$', views.accountmodalview, name='accountmodal')
+    url(r'accountmodal$', views.accountmodalview, name='accountmodal'),
+    url(r'accoutmodal/confirm/(?P<pk>[0-9]+)$', views.accountmodalconfirmview, name="accountmodalconfirm")
 ]
diff --git a/billard/views.py b/billard/views.py
index e17eb76..7eee043 100644
--- a/billard/views.py
+++ b/billard/views.py
@@ -32,12 +32,19 @@ class LocationDataDetailView(DetailView):
 
 @login_required
 def accountmodalview(request):
-    accounts = Accounting.objects.filter(reporter_uuid=Client.objects.get(report_user=request.user).uuid)
+    account = Accounting.objects.filter(reporter_uuid=Client.objects.get(report_user=request.user).uuid).first
     context = {
-        'accounts': accounts
+        '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()
+    redirect('carom_index')
+
 @login_required
 def index(request):
     if request.method == 'GET':
@@ -61,13 +68,11 @@ def index(request):
             loc = min_loc
         locations = Location.objects.filter(users__id=request.user.id).order_by('code')
         clients = Client.objects.filter(location_id=loc).order_by('id')
-        accounts = Accounting.objects.filter(reporter_uuid=Client.objects.get(report_user=request.user).uuid)
         context = {
             'range': range(1, 9),
             'locations': locations,
             'clients': clients,
             'location_id': int(loc),
-            'accounts': accounts,
         }
         return render(request, template, context=context)
     if request.method == 'POST':