diff --git a/regsys/admin.py b/regsys/admin.py index d8fe27c..d1b22d8 100644 --- a/regsys/admin.py +++ b/regsys/admin.py @@ -1,8 +1,13 @@ from django.contrib import admin -from .models import DetailRegistration +from .models import DetailRegistration, Payment @admin.register(DetailRegistration) class DetailRegistrationAdmin(admin.ModelAdmin): pass + + +@admin.register(Payment) +class PaymentAdmin(admin.ModelAdmin): + pass diff --git a/regsys/models.py b/regsys/models.py index 4da8121..b5c10b7 100644 --- a/regsys/models.py +++ b/regsys/models.py @@ -17,10 +17,10 @@ def maxLen(self): class RegStatus: - WAITING_PAYMENT = 'Ceka na zaplaceni' - PAID = 'Zaplaceno' - EXPIRED = 'Platba vyprsela' - CANCELLED = 'Zruseno' + WAITING_PAYMENT = 'WAITING_PAYMENT' + PAID = 'PAID' + EXPIRED = 'EXPIRED' + CANCELLED = 'CANCELLED' choices = ( (WAITING_PAYMENT, 'Ceka na zaplaceni'), @@ -73,7 +73,7 @@ class DetailRegistration(models.Model): fri_night = models.CharField(max_length=10, choices=Sleeping.choices, default=Sleeping.BED) sat_night = models.CharField(max_length=10, choices=Sleeping.choices, default=Sleeping.BED) - status = models.CharField(max_length=10, choices=RegStatus.choices, default=RegStatus.WAITING_PAYMENT) + status = models.CharField(max_length=30, choices=RegStatus.choices, default=RegStatus.WAITING_PAYMENT) internal_message = models.TextField(default='Nothing specific') price = models.IntegerField(default=200) @@ -81,6 +81,9 @@ class DetailRegistration(models.Model): var_symbol = models.IntegerField(primary_key=True) reg_type = models.CharField(max_length=10, choices=RegType.choices, default=RegType.ATTANDEE) + def __str__(self): + return "DetailRegistration, {} {}, status {}".format(self.first_name, self.last_name, self.status) + class Payment(models.Model): pay_date = models.DateField(auto_now=False, editable=False) diff --git a/regsys/templates/regsys/table_of_users.html b/regsys/templates/regsys/table_of_users.html new file mode 100644 index 0000000..d3c2561 --- /dev/null +++ b/regsys/templates/regsys/table_of_users.html @@ -0,0 +1,112 @@ +{% extends 'materialize/materialize_base_dev.html' %} +{% load static %} + + +{% block content %} + +
Status | +RegisterDate | +Name | +Spaní | +Intern message | +
---|---|---|---|---|
+ {% if detail.status == 'PAID' %} + done + {% elif detail.status == 'WAITING_PAYMENT' %} + av_timer + {% elif detail.status == 'EXPIRED' %} + error + {% elif detail.status == 'CANCELLED' %} + clear + {% endif %} + | +{{ detail.date_created }} | +{{ detail.first_name }} {{ detail.last_name }} | +{{ detail.fri_night }}, {{ detail.sat_night }} | +{{ detail.internal_message }} | +