From eb5168a1bdf3fd1c7f349c081a368a4fc5e42a52 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Sat, 29 Apr 2017 11:24:57 +0200 Subject: [PATCH 1/8] set version info --- 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 cba7394..b50a707 100644 --- a/billard/templates/billard/base.html +++ b/billard/templates/billard/base.html @@ -44,7 +44,7 @@ {% endif %} From 9fb04c661d5f2a4c68dd004f57b64dc894c92842 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Sat, 29 Apr 2017 11:34:18 +0200 Subject: [PATCH 2/8] set add info for reinsle --- billard/admin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/billard/admin.py b/billard/admin.py index 062d815..eeff517 100644 --- a/billard/admin.py +++ b/billard/admin.py @@ -61,4 +61,6 @@ class AccountingAdmin(admin.ModelAdmin): list_filter = ('desk__client__location', 'account_user', 'account_tst', 'billed') def has_add_permission(self, request): + if request.user.username == 'reinsle': + return True return False From 50823e56888745d630af767b92eafc88ba10e0b8 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Sat, 29 Apr 2017 11:38:52 +0200 Subject: [PATCH 3/8] do multiple update at once --- billard/views.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/billard/views.py b/billard/views.py index 087fef1..41e3e17 100644 --- a/billard/views.py +++ b/billard/views.py @@ -63,9 +63,11 @@ def accounting_confirm(request, pk): if 'accountings' in request.POST: acc_ids = ast.literal_eval(request.POST['accountings']) if len(acc_ids) > 0: - Accounting.objects.filter(id__in=acc_ids).update(billed=True) - Accounting.objects.filter(id__in=acc_ids).update(account_user=request.user.username) - Accounting.objects.filter(id__in=acc_ids).update(account_tst=timezone.now()) + Accounting.objects.filter(id__in=acc_ids).update( + billed=True, + account_user=request.user.username, + account_tst=timezone.now(), + ) resp = redirect('billard:accounting_detail', pk=pk) return resp From bc89db6179063237af2fa30194d0e4363cdb85e0 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Wed, 17 May 2017 09:57:56 +0200 Subject: [PATCH 4/8] carom/carom-doc#13 fix access accounting objects --- billard/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/billard/views.py b/billard/views.py index 41e3e17..818b3af 100644 --- a/billard/views.py +++ b/billard/views.py @@ -43,7 +43,8 @@ class AccountingView(generic.ListView): context_object_name = 'accounting' def get_queryset(self): - return Accounting.objects.filter(billed=False).exclude(time_to__isnull=True).order_by('time_from') + return Accounting.objects.filter(billed=False).filter(desk__client__location_id=self.kwargs['pk'])\ + .exclude(time_to__isnull=True).order_by('time_from') def dispatch(self, request, *args, **kwargs): result = super(AccountingView, self).dispatch(request, *args, **kwargs) From dd85fcb6ea791f84f0e1bf4ce6c63c6d77e70835 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Wed, 21 Jun 2017 20:59:04 +0200 Subject: [PATCH 5/8] update requirements --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index fd21abf..1547d53 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ celery==4.0.2 -Django==1.11 +Django>=1.11 django-crispy-forms==1.6.1 -django-extensions==1.7.8 -djangorestframework==3.6.2 +django-extensions>=1.7.0 +djangorestframework>=3.6.0 requests==2.13.0 From 9dd2d30dcfea0a39d61be8e4f5254ca273192b76 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Tue, 1 Aug 2017 07:46:24 +0200 Subject: [PATCH 6/8] disable cmd sceduler --- billard/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/billard/models.py b/billard/models.py index 65d6875..055d03a 100644 --- a/billard/models.py +++ b/billard/models.py @@ -100,4 +100,4 @@ class Accounting(models.Model): @receiver(post_save, sender=LocationData) def test(sender, **kwargs): from .tasks import process_location_data - process_location_data.delay() + process_location_data() From 294b189a92b2b8b03fc75d2a3d505fb2cdf346f1 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Tue, 1 Aug 2017 07:48:41 +0200 Subject: [PATCH 7/8] add order by --- billard/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/billard/tasks.py b/billard/tasks.py index e3194f0..fceae52 100644 --- a/billard/tasks.py +++ b/billard/tasks.py @@ -10,7 +10,7 @@ log = logging.getLogger(__name__) @shared_task def process_location_data(): - data = LocationData.objects.filter(processed=False) + data = LocationData.objects.filter(processed=False).order_by('tst') for ld in data: cli = Client.objects.filter(uuid=ld.client_id, desks__desk_no=ld.desk_no) if cli.count() < 1: From dd28964bf96cd166705ebee6794d1c152ae57bd9 Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Tue, 1 Aug 2017 07:57:00 +0200 Subject: [PATCH 8/8] set version info --- 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 b50a707..2f5f70c 100644 --- a/billard/templates/billard/base.html +++ b/billard/templates/billard/base.html @@ -44,7 +44,7 @@ {% endif %}