diff options
| -rw-r--r-- | django/bank_app/admin.py | 5 | ||||
| -rw-r--r-- | django/bank_app/management/commands/pre_accounts.py | 7 | ||||
| -rw-r--r-- | django/bank_app/migrations/__init__.py | 0 | ||||
| -rw-r--r-- | django/bank_app/models.py | 4 | ||||
| -rw-r--r-- | requirements.txt | 2 |
5 files changed, 12 insertions, 6 deletions
diff --git a/django/bank_app/admin.py b/django/bank_app/admin.py index 8f61887..e5f6359 100644 --- a/django/bank_app/admin.py +++ b/django/bank_app/admin.py @@ -2,5 +2,10 @@ this file is in the public domain """ from django.contrib import admin +from .models import (BankAccount, + History) + +admin.site.register(BankAccount) +admin.site.register(History) # Register your models here. diff --git a/django/bank_app/management/commands/pre_accounts.py b/django/bank_app/management/commands/pre_accounts.py index c408851..010f5e6 100644 --- a/django/bank_app/management/commands/pre_accounts.py +++ b/django/bank_app/management/commands/pre_accounts.py @@ -26,8 +26,9 @@ from bank_app.config import pre_accounts def make_accounts(): for u in pre_accounts: + print("Processing " + u) try: - User.objects.get(u) + User.objects.get(username=u) except User.DoesNotExist: try: a = User.objects.create_user(username=u, password='') @@ -36,10 +37,10 @@ def make_accounts(): return is_public = not (u == 'http://mint.test.taler.net' or u == 'http://mint.demo.taler.net') - b = BankAccount(balance=0, + b = BankAccount(user=a, currency=get_currency(None), - user=a, is_public=is_public) + print (" with account number " + str(b.account_no)) b.save() diff --git a/django/bank_app/migrations/__init__.py b/django/bank_app/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/django/bank_app/migrations/__init__.py +++ /dev/null diff --git a/django/bank_app/models.py b/django/bank_app/models.py index f1aacb7..528748e 100644 --- a/django/bank_app/models.py +++ b/django/bank_app/models.py @@ -29,10 +29,9 @@ class BankAccount(models.Model): # example when an http and https exchanges want to have the same # bank account number account_no = models.AutoField(primary_key=True) - #account_no = models.IntegerField(default=0) + # account_no = models.IntegerField(default=0) user = models.OneToOneField(User, on_delete=models.CASCADE) - # primary_key=True) class History(models.Model): @@ -43,6 +42,7 @@ class History(models.Model): subject = models.CharField(default="not given", max_length=200) date = models.DateField(auto_now=True) account = models.ForeignKey(BankAccount, on_delete=models.CASCADE) + dummy = models.IntegerField(default=0) def set_balance(self, new_balance): if isinstance(new_balance, int) or isinstance(new_balance, float): diff --git a/requirements.txt b/requirements.txt index f8762fd..4d1ecd7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==1.9.2 +Django==1.9.5 django-simple-math-captcha==1.0.7 psycopg2==2.6.1 requests==2.9.1 |