gitolite/yamatemat
gitolite
/
yamatemat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve models

This commit is contained in:
Konstantin Martini 2015-01-03 05:23:00 +01:00
parent 8efceb1d01
commit 7235758a62
7 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
matecnt/models.py
View File

@ -1,26 +1,20 @@
from django.db import models
class CodeTagged(models.Model):
class Drinker(models.Model):
name = models.CharField(max_length=123)
code = models.CharField(max_length=128)
def __str__(self):
return '<%r %s>' % (self.name, self.code)
name = models.CharField(max_length=123)
class Meta:
abstract = True
code = models.CharField(max_length=128)
class Drinker(CodeTagged):
credit = models.IntegerField(default=0)
class Drink(models.Model):
def __str__(self):
return '<%r %s>' % (self.name, self.code)
name = models.CharField(max_length=123)
code = models.CharField(max_length=23)
class Drink(CodeTagged):
prize = models.IntegerField(default=3)

4
matecnt/urls.py
View File

@ -8,9 +8,9 @@ urlpatterns = patterns('',
#(r'.*$', 'matecnt.views.overview'),
(r'index$', 'matecnt.views.index'),
(r'users/.*$', 'matecnt.views.users'),
(r'user/(?P<code>\d+)$', 'matecnt.views.user'),
(r'user/(?P<code>\w+)$', 'matecnt.views.user'),
(r'drinks/.*$', 'matecnt.views.drinks'),
(r'drink/(?P<code>\d+)$', 'matecnt.views.drink'),
(r'drink/(?P<code>\w+)$', 'matecnt.views.drink'),
(r'checkout', 'matecnt.views.checkout'),
(r'charge', 'matecnt.views.charge')
)

9
templates/base.html
View File

@ -5,6 +5,15 @@
<title>{{ heading }}</title>
</head>
<body>
<div class="navigation">
<a href="/mate/index"> Start </a> |
<a href="/mate/users/"> Drinkers </a> |
<a href="/mate/drinks/"> Drinks </a> |
<a href="/mate/index"> Don't Panic! </a>
</div>
<hr />
<div class="content">
{% block content %}{% endblock %}
</div>
</body>
</html>

3
templates/charge.html
View File

@ -4,6 +4,7 @@
<h1>{{ heading }}</h1>
<h2>
{{drinker.name}} charges up {{amount}} units.
<a href="/mate/user/{{ drinker.code }}">{{ drinker.name }}</a>
charges up {{amount}} units.
</h2>
{% endblock %}

4
templates/checkout.html
View File

@ -4,6 +4,8 @@
<h1>{{ heading }}</h1>
<h2>
{{drinker.name}} spends {{total}} units on {{drink.name}}.
<a href="/mate/user/{{ drinker.code }}">{{ drinker.name }}</a>
spends {{total}} units on
<a href="/mate/drink/{{ drink.code }}">{{ drink.name }}</a>.
</h2>
{% endblock %}

8
templates/index.html
View File

@ -5,15 +5,11 @@
<hr />
<h2>
<a href="/mate/users/">
User list
</a>
<a href="/mate/users/">User list</a>
</h2>
|
{% for drinker in drinkers %}
<a href="/mate/user/{{ drinker.code }}">
{{ drinker.name }}
</a> |
<a href="/mate/user/{{ drinker.code }}">{{ drinker.name }}</a> |
{% endfor %}
<hr />

2
templates/users.html
View File

@ -5,7 +5,7 @@
{% for drinker in drinkers %}
<h2>
<a href="/drinker/{{ drinker.code }}">
<a href="/mate/user/{{ drinker.code }}">
{{ drinker.name }}
</a>
</h2>