diff --git a/billard/templates/billard/accountmodal.html b/billard/templates/billard/accountmodal.html
index 9d0b008..f064504 100644
--- a/billard/templates/billard/accountmodal.html
+++ b/billard/templates/billard/accountmodal.html
@@ -22,7 +22,7 @@
diff --git a/billard/templates/billard/location_detail.html b/billard/templates/billard/location_detail.html
index 6925e3f..726bd90 100644
--- a/billard/templates/billard/location_detail.html
+++ b/billard/templates/billard/location_detail.html
@@ -20,6 +20,12 @@ $(document).ready(function() {
function refresh_page() {
$('#desk_data').load('#');
+ $('#modal-wrapper').load('{% url 'billard:account_modal' %}', function() {
+ if ( $('#accountsmodal').length ) {
+ window.clearInterval(interval);
+ $('#accountsmodal').modal('show');
+ }
+ });
}
{% endblock %}
\ No newline at end of file
diff --git a/billard/urls.py b/billard/urls.py
index f06ab1c..09a5f40 100644
--- a/billard/urls.py
+++ b/billard/urls.py
@@ -16,6 +16,10 @@ urlpatterns = [
url(r'^(?P[0-9]+)/accounting/$', views.AccountingView.as_view(), name='accounting_detail'),
# ex. /billard/1/accounting/confirm
url(r'^(?P[0-9]+)/accounting/confirm/$', views.accounting_confirm, name='accounting_detail_confirm'),
+ # ex. /billard/1/account_modal/
+ url(r'^account_modal/$', views.account_modal_view, name='account_modal'),
+ # ex. /billard/1/account_modal/confirm/
+ url(r'^account_modal/(?P[0-9]+)/confirm/$', views.account_modal_confirm_view, name='account_modal_confirm'),
# rest api
url(r'api/v1/', include(router.urls)),
@@ -23,7 +27,7 @@ urlpatterns = [
#url(r'^(?P[0-9]+)/$', views.LocationDataDetailView.as_view(), name='detail'),
#url(r'process_locationdata', views.process_locationdata, name='process_locationdata'),
#url(r'^accounting/$', views.AccountingView.as_view(), name='accounting'),
- url(r'^accountmodal$', views.accountmodalview, name='accountmodal'),
- url(r'^accoutmodal/confirm/(?P[0-9]+)$', views.accountmodalconfirmview, name="accountmodalconfirm")
+ #url(r'^accountmodal$', views.accountmodalview, name='accountmodal'),
+ #url(r'^accoutmodal/confirm/(?P[0-9]+)$', views.accountmodalconfirmview, name="accountmodalconfirm")
# (?P[0-9]+)
]
diff --git a/billard/views.py b/billard/views.py
index 1040b72..d33eedb 100644
--- a/billard/views.py
+++ b/billard/views.py
@@ -67,6 +67,28 @@ def accounting_confirm(request, pk):
return resp
+@login_required
+def account_modal_view(request):
+ try:
+ uuids = Client.objects.filter(report_user=request.user).values_list('uuid')
+ account = Accounting.objects.filter(reporter_uuid__in=uuids).first
+ # TODO: support multiple account objects
+ except Client.DoesNotExist:
+ account = None
+ context = {
+ 'account': account
+ }
+ return render(request, 'billard/accountmodal.html', context=context)
+
+
+@login_required
+def account_modal_confirm_view(request, pk):
+ account = Accounting.objects.get(pk=pk)
+ account.reporter_uuid = None
+ account.save()
+ return redirect('billard:location_detail', pk=account.desk.client.location_id)
+
+
# TODO OLD CODE, CLEAN UP
@@ -93,26 +115,6 @@ class LocationDataDetailView(DetailView):
return super().get_template_names()
-@login_required
-def accountmodalview(request):
- try:
- uuids = Client.objects.filter(report_user=request.user).values_list('uuid')
- account = Accounting.objects.filter(reporter_uuid__in=uuids).first
- # TODO: support multiple account objects
- 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('billard:location_detail', pk=pk)
@login_required