Skip to content
Snippets Groups Projects
Commit 827e3842 authored by Chris Heitkamp / SuperVirus's avatar Chris Heitkamp / SuperVirus Committed by Chris Heitkamp
Browse files

warpshop_server: Benutzer => Karte, um Namenskollision mit Benutzerverwaltung zu vermeiden.

parent 948ddfa0
Branches master
No related tags found
No related merge requests found
Showing
with 18 additions and 18 deletions
No preview for this file type
doc/warpshop-db.png

34.5 KiB | W: | H:

doc/warpshop-db.png

48.3 KiB | W: | H:

doc/warpshop-db.png
doc/warpshop-db.png
doc/warpshop-db.png
doc/warpshop-db.png
  • 2-up
  • Swipe
  • Onion skin
from __future__ import absolute_import from __future__ import absolute_import
from django.contrib import admin from django.contrib import admin
from .models import Benutzer from .models import Karte
admin.site.register(Benutzer) admin.site.register(Karte)
...@@ -11,7 +11,7 @@ class Migration(migrations.Migration): ...@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name='Benutzer', name='Karte',
fields=[ fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('aktiv', models.BooleanField(default=True)), ('aktiv', models.BooleanField(default=True)),
...@@ -20,9 +20,9 @@ class Migration(migrations.Migration): ...@@ -20,9 +20,9 @@ class Migration(migrations.Migration):
('saldo', models.DecimalField(max_digits=8, decimal_places=2)), ('saldo', models.DecimalField(max_digits=8, decimal_places=2)),
], ],
options={ options={
'db_table': b'benutzer', 'db_table': b'karte',
'verbose_name': b'Benutzer', 'verbose_name': b'Karte',
'verbose_name_plural': b'Benutzer', 'verbose_name_plural': b'Karten',
}, },
bases=(models.Model,), bases=(models.Model,),
), ),
......
...@@ -2,7 +2,7 @@ from __future__ import absolute_import ...@@ -2,7 +2,7 @@ from __future__ import absolute_import
from django.db import models from django.db import models
class Benutzer(models.Model): class Karte(models.Model):
aktiv = models.BooleanField(default=True) aktiv = models.BooleanField(default=True)
barcode = models.CharField(max_length=200) barcode = models.CharField(max_length=200)
name = models.CharField(max_length=200) name = models.CharField(max_length=200)
...@@ -12,6 +12,6 @@ class Benutzer(models.Model): ...@@ -12,6 +12,6 @@ class Benutzer(models.Model):
return '%s [%s]' % (self.name, self.barcode) return '%s [%s]' % (self.name, self.barcode)
class Meta: class Meta:
db_table = "benutzer" db_table = "karte"
verbose_name = "Benutzer" verbose_name = "Karte"
verbose_name_plural = "Benutzer" verbose_name_plural = "Karten"
...@@ -3,4 +3,4 @@ from django.http import HttpResponse ...@@ -3,4 +3,4 @@ from django.http import HttpResponse
def index(request): def index(request):
return HttpResponse("Benutzer index.") return HttpResponse("Karte index.")
...@@ -7,7 +7,7 @@ from django.db import models, migrations ...@@ -7,7 +7,7 @@ from django.db import models, migrations
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('benutzer', '0001_initial'), ('karte', '0001_initial'),
('artikel', '0001_initial'), ('artikel', '0001_initial'),
] ]
...@@ -33,7 +33,7 @@ class Migration(migrations.Migration): ...@@ -33,7 +33,7 @@ class Migration(migrations.Migration):
fields=[ fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('timestamp', models.DateTimeField(auto_now_add=True)), ('timestamp', models.DateTimeField(auto_now_add=True)),
('benutzer', models.ForeignKey(to='benutzer.Benutzer')), ('karte', models.ForeignKey(to='karte.Karte')),
], ],
options={ options={
'db_table': b'transaktion', 'db_table': b'transaktion',
......
...@@ -2,15 +2,15 @@ from __future__ import absolute_import ...@@ -2,15 +2,15 @@ from __future__ import absolute_import
from django.db import models from django.db import models
from artikel.models import Artikel from artikel.models import Artikel
from benutzer.models import Benutzer from karte.models import Karte
class Transaktion(models.Model): class Transaktion(models.Model):
timestamp = models.DateTimeField(auto_now_add=True) timestamp = models.DateTimeField(auto_now_add=True)
benutzer = models.ForeignKey(Benutzer) karte = models.ForeignKey(Karte)
def __str__(self): def __str__(self):
return '%s [%s] [%s]' % (self.id, self.timestamp, self.benutzer) return '%s [%s] [%s]' % (self.id, self.timestamp, self.karte)
class Meta: class Meta:
db_table = "transaktion" db_table = "transaktion"
......
...@@ -195,7 +195,7 @@ DJANGO_APPS = ( ...@@ -195,7 +195,7 @@ DJANGO_APPS = (
# Apps specific for this project go here. # Apps specific for this project go here.
LOCAL_APPS = ( LOCAL_APPS = (
'artikel', 'artikel',
'benutzer', 'karte',
'transaktion', 'transaktion',
) )
......
...@@ -21,7 +21,7 @@ urlpatterns = patterns('', ...@@ -21,7 +21,7 @@ urlpatterns = patterns('',
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^artikel/', include('artikel.urls', namespace='artikel')), url(r'^artikel/', include('artikel.urls', namespace='artikel')),
url(r'^benutzer/', include('benutzer.urls', namespace='benutzer')), url(r'^karte/', include('karte.urls', namespace='karte')),
url(r'^transaktion/', include('transaktion.urls', namespace='transaktion')), url(r'^transaktion/', include('transaktion.urls', namespace='transaktion')),
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment