\n'.format(alert)
html += '
({}) {} \n'.format(desk_no, desk.name)
if loc.happy_hour_start is not None and desk.prize_hh is not None:
- html += '
Preis: {:.2f} € / Stunde | {} - {}: {:.2f} / € Stunde \n'\
+ html += '
Preis: {:.2f} € / Stunde | {} - {}: {:.2f} / € Stunde \n' \
.format(
- desk.prize,
- loc.happy_hour_start.strftime('%H:%M'),
- loc.happy_hour_end.strftime('%H:%M'),
- desk.prize_hh,)
+ desk.prize,
+ loc.happy_hour_start.strftime('%H:%M'),
+ loc.happy_hour_end.strftime('%H:%M'),
+ desk.prize_hh, )
else:
html += '
Preis: {0:.2f} / Stunde \n'.format(
- desk.prize,)
+ desk.prize, )
if len(acc) > 0:
html += '
\n'
for a in acc:
@@ -52,7 +57,7 @@ def display_client(client, desk_no):
html += ' {} \n'.format(a.time_from.strftime('%d.%m.%Y %H:%M:%S'))
html += ' {} \n'.format(
(a.time_to.strftime('%d.%m.%Y %H:%M:%S') if a.time_to is not None else ''))
- html += ' {} \n'\
+ html += ' {} \n' \
.format((a.prize if a.prize is not None else ''))
html += ' \n'
html += ' \n'
diff --git a/billard/templatetags/form_tags.py b/billard/templatetags/form_tags.py
index 8c89b26..d2c518f 100644
--- a/billard/templatetags/form_tags.py
+++ b/billard/templatetags/form_tags.py
@@ -1,4 +1,5 @@
from django import template
+from django.conf import settings
register = template.Library()
@@ -17,3 +18,8 @@ def input_class(bound_field):
elif field_type(bound_field) != 'PasswordInput':
css_class = 'is-valid'
return 'form-control {}'.format(css_class)
+
+
+@register.simple_tag
+def settings_value(name):
+ return getattr(settings, name, '')
diff --git a/billard/tests.py b/billard/tests.py
index e738093..b1cc778 100644
--- a/billard/tests.py
+++ b/billard/tests.py
@@ -38,7 +38,7 @@ class PrizeCalculationTestCase(TestCase):
class PrizeGetTestCase(TestCase):
- def get_prize_for(self, start, end, pph=0, hh_start=None, hh_end=None, pphh=0, expected=(0,0,0)):
+ def get_prize_for(self, start, end, pph=0, hh_start=None, hh_end=None, pphh=0, expected=(0, 0, 0)):
self.assertEqual(get_prize_for(start, end, pph, hh_start, hh_end, pphh), expected)
def test_gpf_1(self):
@@ -109,4 +109,4 @@ class PrizeGetTestCase(TestCase):
pph = 10
pphh = 5
expected = (7.5, 5, 2.5)
- self.get_prize_for(start, end, pph, hh_start, hh_end, pphh, expected)
\ No newline at end of file
+ self.get_prize_for(start, end, pph, hh_start, hh_end, pphh, expected)
diff --git a/billard/urls.py b/billard/urls.py
index b02463d..a28b8b8 100644
--- a/billard/urls.py
+++ b/billard/urls.py
@@ -1,28 +1,30 @@
-from django.conf.urls import url, include
+from django.conf.urls import include
from django.contrib.auth.decorators import login_required
+from django.urls import path
from rest_framework import routers
+
from billard import views
router = routers.DefaultRouter()
router.register(r'locationdata', views.LocationDataViewSet)
+router.register(r'last_seen', views.ClientUpdateLastSeenViewSet)
app_name = 'billard'
urlpatterns = [
# ex. /billard/
- url(r'^$', login_required(views.LocationIndexView.as_view()), name='location_index'),
+ path('', login_required(views.LocationIndexView.as_view()), name='location_index'),
# ex. /billard/1/
- url(r'^(?P[0-9]+)/$', login_required(views.LocationDetailView.as_view()), name='location_detail'),
+ path('/', login_required(views.LocationDetailView.as_view()), name='location_detail'),
# ex. /billard/1/accounting/
- url(r'^(?P[0-9]+)/accounting/$', views.AccountingView.as_view(), name='accounting_detail'),
+ path('/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'),
+ path('/accounting/confirm/', views.accounting_confirm, name='accounting_detail_confirm'),
# ex. /billard/1/account_modal/
- url(r'^(?P[0-9]+)/account_modal/$', views.account_modal_view, name='account_modal'),
+ path('/account_modal/', views.account_modal_view, name='account_modal'),
# ex. /billard/1/account_modal/confirm/
- url(r'^(?P[0-9]+)/account_modal/(?P[0-9]+(,[0-9]+)*)/confirm/$', views.account_modal_confirm_view,
- name='account_modal_confirm'),
+ path('/account_modal//confirm/', views.account_modal_confirm_view, name='account_modal_confirm'),
# ex. /billard/api/v1/ (rest api)
- url(r'api/v1/', include(router.urls)),
+ path('api/v1/', include(router.urls)),
# ex. /billard/process_location_data/
- url(r'^process_location_data/$', views.process_location_data, name='process_location_data'),
+ path('process_location_data/', views.process_location_data, name='process_location_data'),
]
diff --git a/billard/utils.py b/billard/utils.py
index 9f8b6f0..29db778 100644
--- a/billard/utils.py
+++ b/billard/utils.py
@@ -1,4 +1,4 @@
-from datetime import datetime, date, time, timedelta
+from datetime import datetime, date, timedelta
def get_prize_for(start, end, pph=0, hh_start=None, hh_end=None, pphh=0):
diff --git a/billard/views.py b/billard/views.py
index f0ef987..2b737d9 100644
--- a/billard/views.py
+++ b/billard/views.py
@@ -1,18 +1,18 @@
import ast
import logging
-from billard.serializers import LocationDataSerializer
-from billard.models import LocationData, Location, Client, Accounting
-from billard.tasks import process_location_data
-from rest_framework import viewsets
-from django.shortcuts import render, redirect
-from django.views import generic
from django.contrib.auth.decorators import login_required, permission_required
from django.db.models import Sum
from django.http import HttpResponse
-from django.utils.decorators import method_decorator
+from django.shortcuts import render, redirect
from django.utils import timezone
+from django.utils.decorators import method_decorator
+from django.views import generic
+from rest_framework import viewsets
+from billard.models import LocationData, Location, Client, Accounting
+from billard.serializers import LocationDataSerializer, ClientUpdateLastSeenSerializer
+from billard.tasks import process_location_data
log = logging.getLogger(__name__)
@@ -47,7 +47,7 @@ class AccountingView(generic.ListView):
context_object_name = 'accounting'
def get_queryset(self):
- return Accounting.objects.filter(billed=False).filter(desk__client__location_id=self.kwargs['pk'])\
+ 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):
@@ -108,6 +108,11 @@ class LocationDataViewSet(viewsets.ModelViewSet):
serializer_class = LocationDataSerializer
+class ClientUpdateLastSeenViewSet(viewsets.ModelViewSet):
+ queryset = LocationData.objects.all()
+ serializer_class = ClientUpdateLastSeenSerializer
+
+
def process_location_data(request):
process_location_data()
return HttpResponse('DONE')
diff --git a/caromserver/local_settings_example.py b/caromserver/local_settings_example.py
new file mode 100644
index 0000000..4258fa4
--- /dev/null
+++ b/caromserver/local_settings_example.py
@@ -0,0 +1,33 @@
+import os
+
+SECRET_KEY = '@-9++2z_6%^vr(f0wax0aq8-pd@0u$*))w!5l^sv#wxrn7k!v-'
+DEBUG = True
+ALLOWED_HOSTS = ['carom-dev.einsle.de']
+ADMINS = [('Robert Einsle', 'robert@einsle.de'),]
+
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.mysql',
+ 'NAME': 'carom-dev',
+ 'USER': 'carom-dev',
+ 'PASSWORD': 'jex290bjDB4djf0iVKYs',
+ 'HOST': '127.0.0.1',
+ 'OPTIONS': {
+ 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"
+ },
+ }
+}
+
+STATIC_ROOT = "/srv/carom-dev/carom-server/staticfiles/"
+
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_HOST = 'mail.einsle.de'
+EMAIL_PORT = 587
+EMAIL_HOST_USER = 'relay@einsle.de'
+EMAIL_HOST_PASSWORD = 'Boaghi0thaiH'
+EMAIL_USE_TLS = True
+DEFAULT_FROM_EMAIL = "webmaster@einsle.de"
+
+URL_LOCATION_PROCESSOR = 'https://carom-dev.einsle.de/billard/process_locationdata'
+
+PRODUCT_INFO = 'carom-dev'
diff --git a/caromserver/settings.py b/caromserver/settings.py
index 621dd8c..767644f 100644
--- a/caromserver/settings.py
+++ b/caromserver/settings.py
@@ -37,14 +37,15 @@ INSTALLED_APPS = [
'django.contrib.staticfiles',
'rest_framework',
'rest_framework.authtoken',
+ 'debug_toolbar',
'crispy_forms',
- 'widget_tweaks',
'billard',
]
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
+ 'debug_toolbar.middleware.DebugToolbarMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -158,6 +159,11 @@ EMAIL_PORT = 25
URL_LOCATION_PROCESSOR = 'http://127.0.0.1:8000/billard/process_locationdata'
+PRODUCT_INFO = 'CAROM-DEV'
+PRODUCT_VERSION = 'v 0.5.1'
+
+INTERNAL_IPS = ['127.0.0.1']
+
try:
from local_settings import *
except ImportError:
diff --git a/caromserver/urls.py b/caromserver/urls.py
index 3943f02..3b29fd7 100644
--- a/caromserver/urls.py
+++ b/caromserver/urls.py
@@ -13,17 +13,26 @@ Including another URLconf
1. Import the include() function: from django.conf.urls import url, include
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
"""
-from django.conf.urls import url, include
+from django.conf import settings
+from django.conf.urls import include
from django.contrib import admin
from django.contrib.auth import views as auth_views
+from django.urls import path
from django.views.generic import RedirectView
urlpatterns = [
- url(r'^admin/', admin.site.urls),
- url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
- url(r'^billard/', include('billard.urls')),
- url(r'^login/$', auth_views.login, name='login'),
- url(r'^logout/$', auth_views.logout, name='logout'),
- url(r'^', include('django.contrib.auth.urls')),
- url(r'^$', RedirectView.as_view(url='billard/', permanent=False), name='index')
+ path('admin/', admin.site.urls),
+ path('api-auth/', include('rest_framework.urls', namespace='rest_framework')),
+ path('billard/', include('billard.urls')),
+ path('login/', auth_views.login, name='login'),
+ path('logout/', auth_views.logout, name='logout'),
+ path('', include('django.contrib.auth.urls')),
+ path('', RedirectView.as_view(url='billard/', permanent=False), name='index')
]
+
+if settings.DEBUG:
+ import debug_toolbar
+
+ urlpatterns = [
+ path('__debug__/', include(debug_toolbar.urls)),
+ ] + urlpatterns
diff --git a/requirements.txt b/requirements.txt
index e63edac..be753b0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
-Django<2.0
+Django<2.1
django-crispy-forms==1.7.0
django-extensions>=1.7.0
djangorestframework>=3.6.0
requests>=2.18.0
-django-widget-tweaks==1.4.1
+django-debug-toolbar<2.0.0
diff --git a/templates/_base.html b/templates/_base.html
index 9852361..77da87d 100644
--- a/templates/_base.html
+++ b/templates/_base.html
@@ -1,10 +1,10 @@
-{% load static %}
+{% load static form_tags %}
carom - {% block title %}TITLE SETZEN{% endblock %}
+ {% settings_value "PRODUCT_INFO" %} - {% block title %}TITLE SETZEN{% endblock %}
-
carom
+
{% settings_value "PRODUCT_INFO" %}
{% block content %}
{% endblock %}
diff --git a/templates/includes/form.html b/templates/includes/form.html
deleted file mode 100644
index d4aa8a9..0000000
--- a/templates/includes/form.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% load form_tags widget_tweaks %}
-
-{% if form.non_field_errors %}
-
- {% for error in form.non_field_errors %}
-
{{ error }}
- {% endfor %}
-
-{% endif %}
-
-{% for field in form %}
-
-{% endfor %}
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 16d4d77..79ae741 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -1,5 +1,7 @@
{% extends '_base_accounts.html' %}
+{% load crispy_forms_tags %}
+
{% block title %}login{% endblock %}
{% block content %}
@@ -11,7 +13,7 @@