Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions kiosk/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

from .models import KioskItem

import logging

logger = logging.getLogger("kiosk")

def kiosk(request):
return render(request, 'kiosk.html', locals())
Expand All @@ -27,6 +30,7 @@ def find_random_media(request):
.first()
)
if item is None:
logging.warning("No active kiosk items found 1")
raise Http404("No active kiosk items found")

response_data = {
Expand All @@ -49,6 +53,7 @@ def find_next_media_real(request, item_id):
.count()
)
if item_count == 0:
logging.warning("No active kiosk items found 2")
raise Http404("No active kiosk items found")

# Get the item at the index, trust that Django does this smartly.
Expand Down
10 changes: 10 additions & 0 deletions razzia/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
from razzia.models import Razzia, RazziaEntry
from stregsystem.models import Member

import logging

logger = logging.getLogger("razzia")

# Create your views here.
@permission_required("razzia.view_razzia")
Expand All @@ -29,6 +32,7 @@ def razzia_view_single(request, razzia_id, queryname, title=None):

result = list(Member.objects.filter(username__iexact=queryname))
if len(result) == 0:
logger.warning(f"Member not found: {queryname}")
return render(request, template, locals())

member = result[0]
Expand All @@ -47,6 +51,7 @@ def razzia_view_single(request, razzia_id, queryname, title=None):
drunkard = True
remaining_time_secs = int(((entries[0].time + razzia.turn_interval) - timezone.now()).total_seconds() % 60)
remaining_time_mins = int(((entries[0].time + razzia.turn_interval) - timezone.now()).total_seconds() // 60)
logger.debug(f"Member back too soon: {remaining_time_mins} min, {remaining_time_secs} sec")
return render(request, template, locals())

RazziaEntry(member=member, razzia=razzia).save()
Expand All @@ -59,10 +64,13 @@ def razzia_menu(request, new_text=None, title=None):
razzias = Razzia.objects.order_by('-pk')[:3]

if not request.user.has_perm("razzia.browse_razzia"):
logger.warning(f"Permission denied, missing browse_razzia", request)
if len(razzias) == 0:
logger.debug("No razzias to redirect to")
# In case no razzias are available, default to no permission
raise PermissionDenied

logger.debug("Redirect to first razzia")
return redirect('razzia_view', razzia_id=razzias[0].pk)

return render(request, 'menu.html', locals())
Expand All @@ -72,12 +80,14 @@ def razzia_menu(request, new_text=None, title=None):
def new_razzia(request):
razzia = Razzia(name="Foobar V2", turn_interval=datetime.timedelta(minutes=30))
razzia.save()
logger.debug(f"New razzia created: {razzia.id}")

return redirect('razzia_view', razzia_id=razzia.pk)


@permission_required("razzia.view_razziaentry")
def razzia_members(request, razzia_id, title=None):
logger.debug("Razzia find members")
razzia = get_object_or_404(Razzia, pk=razzia_id)
unique_members = razzia.members.all().distinct().count()
return render(request, 'members.html', locals())
3 changes: 3 additions & 0 deletions stregsystem/mail.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@


def send_welcome_mail(member):
logger.debug(f"Sending welcome mail to: {member.id}")
send_template_mail(
member,
"welcome.html",
Expand All @@ -25,6 +26,7 @@ def send_welcome_mail(member):


def send_payment_mail(member, amount, mobilepay_comment):
logger.debug(f"Sending payment mail to: {member.id}")
send_template_mail(
member,
"deposit_manual.html" if mobilepay_comment else "deposit_automatic.html",
Expand All @@ -39,6 +41,7 @@ def send_payment_mail(member, amount, mobilepay_comment):
def send_userdata_mail(member):
from .models import Payment, Sale, MobilePayment

logger.debug(f"Sending userdata to:: {member.id}")
now = timezone.now()
td = now - timezone.timedelta(minutes=5)
if member.id in data_sent.keys() and data_sent[member.id] > td:
Expand Down