carom/carom-server
6
1
Fork 0
Code Issues Pull Requests Releases 2 Activity

updated modal code

Browse Source
This commit is contained in:
Alexander Werner
2017-03-06 19:22:01 +01:00
parent 716cb2d347
commit d2e56b99b8
5 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
billard/templates/billard/accountmodal.html Normal file
View File

@@ -0,0 +1,20 @@
{% 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">
<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 %}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
{% endif %}

6
billard/templates/billard/index.html
View File

@@ -19,6 +19,8 @@
<div id="desk_data"> <div id="desk_data">
{% include 'billard/index_ajax.html' %} {% include 'billard/index_ajax.html' %}
</div> </div>
<div id="modal-wrapper">
</div>
{% endblock %} {% endblock %}
{% block js %} {% block js %}
<script type="text/javascript"> <script type="text/javascript">
@@ -29,7 +31,9 @@ $(document).ready(function() {
function refresh_page() { function refresh_page() {
$('#desk_data').load('#'); $('#desk_data').load('#');
$('#accountsmodal').modal(); $('#accountsmodal').modal('hide');
$('#modal-wrapper').load('{% url 'accountmodal' %}');
$('#accountsmodal').modal('show');
} }
</script> </script>
{% endblock %} {% endblock %}

20
billard/templates/billard/index_ajax.html
View File

@@ -8,23 +8,3 @@
<div class="col-md-12 alert alert-danger">Keine Tische angelegt!</div> <div class="col-md-12 alert alert-danger">Keine Tische angelegt!</div>
</div> </div>
{% endif %} {% endif %}
{% if accounts %}
<div id="accountsmodal" class="modal fade" 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 %}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
{% endif %}

3
billard/urls.py
View File

@@ -9,5 +9,6 @@ urlpatterns = [
url(r'^$', views.index, name='carom_index'), url(r'^$', views.index, name='carom_index'),
url(r'^(?P<pk>[0-9]+)/$', views.LocationDataDetailView.as_view(), name='detail'), url(r'^(?P<pk>[0-9]+)/$', views.LocationDataDetailView.as_view(), name='detail'),
url(r'api/v1/', include(router.urls)), url(r'api/v1/', include(router.urls)),
url(r'process_locationdata', views.process_locationdata, name='process_locationdata') url(r'process_locationdata', views.process_locationdata, name='process_locationdata'),
url(r'accountmodal$', views.accountmodalview, name='accountmodal')
] ]

7
billard/views.py
View File

@@ -30,6 +30,13 @@ class LocationDataDetailView(DetailView):
return ('billard/locationdata_detail_ajax.html',) return ('billard/locationdata_detail_ajax.html',)
return super().get_template_names() return super().get_template_names()
@login_required
def accountmodalview(request):
accounts = Accounting.objects.filter(reporter_uuid=Client.objects.get(report_user=request.user).uuid)
context = {
'accounts': accounts
}
return render(request, 'billard/accountmodal.html', context=context)
@login_required @login_required
def index(request): def index(request):