6 Commits

Author SHA1 Message Date
d04e986419 Added display of name and e-mail. 2020-12-24 15:33:46 +01:00
cbbda88850 Remove debug output. 2020-12-24 15:13:40 +01:00
981c440ce3 Fix voucher class description 2020-12-24 15:13:31 +01:00
c7368f5c44 Merge commit '20dd880a11a008ba95cd5aedce59590445430831' into develop 2020-12-24 14:57:09 +01:00
20dd880a11 Indention Error 2020-12-19 15:31:13 +01:00
946c3091c0 Typo "fix" 2020-12-19 15:31:04 +01:00
6 changed files with 63 additions and 49 deletions

View File

@@ -1,22 +0,0 @@
# Generated by Django 3.1.1 on 2020-10-04 19:37
# Edited by reverend
import datetime
from django.db import migrations, models
import django.utils.timezone
from django.utils.timezone import utc
class Migration(migrations.Migration):
dependencies = [
('lostplaces', '0001_initial'),
]
operations = [
migrations.DeleteModel(
name='Voucher'
),
migrations.DeleteModel(
name='Expireable'
)
]

View File

@@ -0,0 +1,22 @@
# Generated by Django 3.1.1 on 2020-10-04 19:37
# Edited by reverend
import datetime
from django.db import migrations, models
import django.utils.timezone
from django.utils.timezone import utc
class Migration(migrations.Migration):
dependencies = [
('lostplaces', '0001_initial'),
]
operations = [
migrations.DeleteModel(
name='Voucher'
),
migrations.DeleteModel(
name='Expireable'
)
]

View File

@@ -41,11 +41,13 @@ def save_user_profile(sender, instance, **kwargs):
class Voucher(Expireable): class Voucher(Expireable):
""" """
Vouchers are authorization to created_when = models.DateTimeField(auto_now_add=True) Vouchers are authorization tokens to allow the registration of new users.
expires_when = models.DateTimeField()kens to allow the registration of new users.
A voucher has a code, a creation and a deletion date, which are all A voucher has a code, a creation and a deletion date, which are all
positional. Creation date is being set automatically during voucher positional. Creation date is being set automatically during voucher
creation. creation.
created_when = models.DateTimeField(auto_now_add=True)
expires_when = models.DateTimeField()
""" """
code = models.CharField(unique=True, max_length=30) code = models.CharField(unique=True, max_length=30)

View File

@@ -14,6 +14,22 @@
</div> </div>
<div class="LP-UserInfo__Meta"> <div class="LP-UserInfo__Meta">
<table> <table>
<tr>
<td class="LP-UserInfo__Key">
<span class="LP-Paragraph">{% trans 'Name' %}</span>
</td>
<td class="LP-UserInfo__Value">
<span class="LP-Paragraph">{{explorer.user.first_name}} {{explorer.user.last_name}}</span>
</td>
</tr>
<tr>
<td class="LP-UserInfo__Key">
<span class="LP-Paragraph">{% trans 'E-Mail' %}</span>
</td>
<td class="LP-UserInfo__Value">
<span class="LP-Paragraph">{{explorer.user.email}}</span>
</td>
</tr>
<tr> <tr>
<td class="LP-UserInfo__Key"> <td class="LP-UserInfo__Key">
<span class="LP-Paragraph">{% trans 'Joined' %}</span> <span class="LP-Paragraph">{% trans 'Joined' %}</span>

View File

@@ -34,12 +34,8 @@ class ExplorerProfileView(IsAuthenticatedMixin, View):
context['asset_count'] = asset_count context['asset_count'] = asset_count
print(context['assets'])
return render( return render(
request=request, request=request,
template_name='explorer/profile.html', template_name='explorer/profile.html',
context=context context=context
) )