From 9f04b7b5573deb3124a8bff7bb2b92fdb1528ffc Mon Sep 17 00:00:00 2001
From: Alexander Werner <alex@documentfoundation.org>
Date: Thu, 17 Aug 2017 20:09:45 +0200
Subject: [PATCH 1/7] Show multiple accounts in accountmodal

---
 billard/templates/billard/accountmodal.html | 32 ++++++++++++---------
 billard/urls.py                             |  2 +-
 billard/views.py                            | 16 ++++++-----
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/billard/templates/billard/accountmodal.html b/billard/templates/billard/accountmodal.html
index a38dedd..34893a5 100644
--- a/billard/templates/billard/accountmodal.html
+++ b/billard/templates/billard/accountmodal.html
@@ -1,28 +1,34 @@
-{% if account %}
+{% if accounts %}
 <div id="accountsmodal" class="modal" tabindex="-1" role="dialog">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Abrechnung: ({{ account.desk.desk_no }}) {{ account.desk.name }} </h4>
+        <h4 class="modal-title">Abrechnung</h4>
       </div>
       <div class="modal-body">
         <table class="table">
+            <thead>
+            <tr>
+                <td>Tisch #</td>
+                <td>Tisch Name</td>
+                <td>Normalpreis</td>
+                <td>Preis HH</td>
+                <td>Gesamt</td>
+            </tr>
+            </thead>
+            {% for account in accounts %}
           <tr>
-            <td>Normalpreis:</td>
-            <td>{{ account.prize_normal }}</td>
-          </tr>
-          <tr>
-            <td>Preis Happy Hour:</td>
-            <td>{{ account.prize_hh }}</td>
-          </tr>
-          <tr>
-            <td>Gesamt:</td>
-            <td>{{ account.prize }}</td>
+              <td>{{ account.desk.desk_no }}</td>
+              <td>{{ account.desk.name }}</td>
+              <td>{{ account.prize_normal }}</td>
+              <td>{{ account.prize_hh }}</td>
+              <td>{{ account.prize }}</td>
           </tr>
+            {% endfor %}
         </table>
       </div>
       <div class="modal-footer">
-        <a class="btn btn-default btn-primary" href="{% url 'billard:account_modal_confirm' pk=account.id loc_pk=loc_pk %}">Schliessen</a>
+        <a class="btn btn-default btn-primary" href="{% url 'billard:account_modal_confirm' pks=pks loc_pk=loc_pk %}">Schliessen</a>
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
diff --git a/billard/urls.py b/billard/urls.py
index c9fc1e4..88af92e 100644
--- a/billard/urls.py
+++ b/billard/urls.py
@@ -19,7 +19,7 @@ urlpatterns = [
     # ex. /billard/1/account_modal/
     url(r'^(?P<loc_pk>[0-9]+)/account_modal/$', views.account_modal_view, name='account_modal'),
     # ex. /billard/1/account_modal/confirm/
-    url(r'^(?P<loc_pk>[0-9]+)/account_modal/(?P<pk>[0-9]+)/confirm/$', views.account_modal_confirm_view,
+    url(r'^(?P<loc_pk>[0-9]+)/account_modal/(?P<pks>([0-9],)+)/confirm/$', views.account_modal_confirm_view,
         name='account_modal_confirm'),
     # ex. /billard/api/v1/ (rest api)
     url(r'api/v1/', include(router.urls)),
diff --git a/billard/views.py b/billard/views.py
index ba7a6f1..13622f3 100644
--- a/billard/views.py
+++ b/billard/views.py
@@ -81,22 +81,24 @@ def accounting_confirm(request, pk):
 def account_modal_view(request, loc_pk):
     try:
         uuids = Client.objects.filter(report_user=request.user).values_list('uuid')
-        account = Accounting.objects.filter(reporter_uuid__in=uuids).first
+        accounts = Accounting.objects.filter(reporter_uuid__in=uuids)
         # TODO: support multiple account objects
     except Client.DoesNotExist:
-        account = None
+        accounts = None
     context = {
-        'account': account,
+        'accounts': accounts,
         'loc_pk': loc_pk,
+        'pks': ','.join([account.pk for account in accounts]),
     }
     return render(request, 'billard/accountmodal.html', context=context)
 
 
 @login_required
-def account_modal_confirm_view(request, loc_pk, pk):
-    account = Accounting.objects.get(pk=pk)
-    account.reporter_uuid = None
-    account.save()
+def account_modal_confirm_view(request, loc_pk, pks):
+    for pk in pks.split(','):
+        account = Accounting.objects.get(pk=pk)
+        account.reporter_uuid = None
+        account.save()
     return redirect('billard:location_detail', pk=loc_pk)
 
 

From 6c5887864686bc9690fb412f6145386c05ee2ede Mon Sep 17 00:00:00 2001
From: Alexander Werner <alex@documentfoundation.org>
Date: Thu, 17 Aug 2017 20:12:22 +0200
Subject: [PATCH 2/7] Fixed typeerror in accountmodal

---
 billard/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/billard/views.py b/billard/views.py
index 13622f3..e728437 100644
--- a/billard/views.py
+++ b/billard/views.py
@@ -88,7 +88,7 @@ def account_modal_view(request, loc_pk):
     context = {
         'accounts': accounts,
         'loc_pk': loc_pk,
-        'pks': ','.join([account.pk for account in accounts]),
+        'pks': ','.join([str(account.pk) for account in accounts]),
     }
     return render(request, 'billard/accountmodal.html', context=context)
 

From d115a58600fc9052b96a606d98a1b3151c712842 Mon Sep 17 00:00:00 2001
From: Alexander Werner <alex@documentfoundation.org>
Date: Thu, 17 Aug 2017 20:16:25 +0200
Subject: [PATCH 3/7] Fixed urls parsing for accountmodal

---
 billard/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/billard/urls.py b/billard/urls.py
index 88af92e..b02463d 100644
--- a/billard/urls.py
+++ b/billard/urls.py
@@ -19,7 +19,7 @@ urlpatterns = [
     # ex. /billard/1/account_modal/
     url(r'^(?P<loc_pk>[0-9]+)/account_modal/$', views.account_modal_view, name='account_modal'),
     # ex. /billard/1/account_modal/confirm/
-    url(r'^(?P<loc_pk>[0-9]+)/account_modal/(?P<pks>([0-9],)+)/confirm/$', views.account_modal_confirm_view,
+    url(r'^(?P<loc_pk>[0-9]+)/account_modal/(?P<pks>[0-9]+(,[0-9]+)*)/confirm/$', views.account_modal_confirm_view,
         name='account_modal_confirm'),
     # ex. /billard/api/v1/ (rest api)
     url(r'api/v1/', include(router.urls)),

From 33cd50a2c655536e8d4fc3a53b96e385373c8ce2 Mon Sep 17 00:00:00 2001
From: Alexander Werner <alex@documentfoundation.org>
Date: Thu, 17 Aug 2017 20:19:20 +0200
Subject: [PATCH 4/7] accountmodal typography

---
 billard/templates/billard/accountmodal.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/billard/templates/billard/accountmodal.html b/billard/templates/billard/accountmodal.html
index 34893a5..e1b3fd4 100644
--- a/billard/templates/billard/accountmodal.html
+++ b/billard/templates/billard/accountmodal.html
@@ -20,9 +20,9 @@
           <tr>
               <td>{{ account.desk.desk_no }}</td>
               <td>{{ account.desk.name }}</td>
-              <td>{{ account.prize_normal }}</td>
-              <td>{{ account.prize_hh }}</td>
-              <td>{{ account.prize }}</td>
+              <td class="text-right">{{ account.prize_normal }}</td>
+              <td class="text-right">{{ account.prize_hh }}</td>
+              <td class="text-right font-weight-bold">{{ account.prize }}</td>
           </tr>
             {% endfor %}
         </table>

From 899ddb24e51cc6fb64f6f1f120e5d654a00067ca Mon Sep 17 00:00:00 2001
From: Alexander Werner <alex@documentfoundation.org>
Date: Thu, 17 Aug 2017 20:23:14 +0200
Subject: [PATCH 5/7] accountmodal table style

---
 billard/templates/billard/accountmodal.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/billard/templates/billard/accountmodal.html b/billard/templates/billard/accountmodal.html
index e1b3fd4..9ccd870 100644
--- a/billard/templates/billard/accountmodal.html
+++ b/billard/templates/billard/accountmodal.html
@@ -6,14 +6,14 @@
         <h4 class="modal-title">Abrechnung</h4>
       </div>
       <div class="modal-body">
-        <table class="table">
+        <table class="table table-striped">
             <thead>
             <tr>
                 <td>Tisch #</td>
                 <td>Tisch Name</td>
-                <td>Normalpreis</td>
-                <td>Preis HH</td>
-                <td>Gesamt</td>
+                <td class="text-right">Normalpreis</td>
+                <td class="text-right">Preis HH</td>
+                <td class="text-right">Gesamt</td>
             </tr>
             </thead>
             {% for account in accounts %}
@@ -22,7 +22,7 @@
               <td>{{ account.desk.name }}</td>
               <td class="text-right">{{ account.prize_normal }}</td>
               <td class="text-right">{{ account.prize_hh }}</td>
-              <td class="text-right font-weight-bold">{{ account.prize }}</td>
+              <td class="text-right"><strong>{{ account.prize }}</strong></td>
           </tr>
             {% endfor %}
         </table>

From e674b95d40f5d55bf1fef988f71d2fc394bc7236 Mon Sep 17 00:00:00 2001
From: Robert Einsle <robert@einsle.de>
Date: Fri, 18 Aug 2017 10:41:15 +0200
Subject: [PATCH 6/7] set version information

---
 billard/templates/billard/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/billard/templates/billard/base.html b/billard/templates/billard/base.html
index 9836cdb..2e43a2d 100644
--- a/billard/templates/billard/base.html
+++ b/billard/templates/billard/base.html
@@ -50,7 +50,7 @@
 {% endif %}
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
-                    <li><a href="#">c@0.2.1</a></li>
+                    <li><a href="#">c@0.2.2</a></li>
                 </ul>
             </div><!--/.nav-collapse -->
         </div>

From acaa9441a5419079cb3cb2cdd1e59bcd37f51586 Mon Sep 17 00:00:00 2001
From: Robert Einsle <robert@einsle.de>
Date: Fri, 18 Aug 2017 10:43:02 +0200
Subject: [PATCH 7/7] set version information

---
 billard/templates/billard/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/billard/templates/billard/base.html b/billard/templates/billard/base.html
index 2e43a2d..5bc1de0 100644
--- a/billard/templates/billard/base.html
+++ b/billard/templates/billard/base.html
@@ -50,7 +50,7 @@
 {% endif %}
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
-                    <li><a href="#">c@0.2.2</a></li>
+                    <li><a href="#">c@0.2.3</a></li>
                 </ul>
             </div><!--/.nav-collapse -->
         </div>