From 0f6c98a36f226616485c0636979887ee4ceb2b65 Mon Sep 17 00:00:00 2001 From: Schlabonski Date: Sat, 14 Jan 2017 11:13:25 +0100 Subject: [PATCH] add more pythonic string generation in klettertreff model --- jdav_web/material/migrations/0001_initial.py | 20 +++++++++--- jdav_web/members/migrations/0001_initial.py | 32 +++++++++++++++---- .../members/migrations/0002_member_email.py | 20 ------------ .../migrations/0003_auto_20161018_1742.py | 20 ------------ .../migrations/0004_auto_20161018_1744.py | 24 -------------- jdav_web/members/models.py | 3 +- jdav_web/startpage/migrations/__init__.py | 0 7 files changed, 41 insertions(+), 78 deletions(-) delete mode 100644 jdav_web/members/migrations/0002_member_email.py delete mode 100644 jdav_web/members/migrations/0003_auto_20161018_1742.py delete mode 100644 jdav_web/members/migrations/0004_auto_20161018_1744.py delete mode 100644 jdav_web/startpage/migrations/__init__.py diff --git a/jdav_web/material/migrations/0001_initial.py b/jdav_web/material/migrations/0001_initial.py index 7f71953..77e4e51 100644 --- a/jdav_web/material/migrations/0001_initial.py +++ b/jdav_web/material/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10.2 on 2016-10-18 19:07 +# Generated by Django 1.10.2 on 2016-11-19 14:56 from __future__ import unicode_literals from django.db import migrations, models @@ -11,7 +11,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('members', '0004_auto_20161018_1744'), + ('members', '0001_initial'), ] operations = [ @@ -19,17 +19,27 @@ class Migration(migrations.Migration): name='MaterialPart', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=30)), + ('name', models.CharField(max_length=30, verbose_name='name')), ('buy_date', models.DateField(verbose_name='purchase date')), + ('lifetime', models.DecimalField(decimal_places=0, max_digits=3, verbose_name='lifetime (years)')), + ('photo', models.ImageField(blank=True, upload_to='images', verbose_name='photo')), ], + options={ + 'verbose_name_plural': 'material parts', + 'verbose_name': 'material part', + }, ), migrations.CreateModel( name='Ownership', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('count', models.IntegerField(default=1)), + ('count', models.IntegerField(default=1, verbose_name='count')), ('material', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='material.MaterialPart')), - ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='members.Member')), + ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='members.Member', verbose_name='owner')), ], + options={ + 'verbose_name_plural': 'ownerships', + 'verbose_name': 'ownership', + }, ), ] diff --git a/jdav_web/members/migrations/0001_initial.py b/jdav_web/members/migrations/0001_initial.py index 3c010b2..990e9ef 100644 --- a/jdav_web/members/migrations/0001_initial.py +++ b/jdav_web/members/migrations/0001_initial.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10.2 on 2016-10-18 17:36 +# Generated by Django 1.10.2 on 2016-11-19 14:56 from __future__ import unicode_literals +import datetime from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): @@ -18,18 +18,36 @@ class Migration(migrations.Migration): name='Group', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=20)), - ('min_age', models.IntegerField(default=5)), + ('name', models.CharField(max_length=20, verbose_name='name')), + ('min_age', models.IntegerField(default=5, verbose_name='minimum age (years)')), ], + options={ + 'verbose_name_plural': 'groups', + 'verbose_name': 'group', + }, ), migrations.CreateModel( name='Member', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('prename', models.CharField(max_length=20)), - ('lastname', models.CharField(max_length=20)), + ('prename', models.CharField(max_length=20, verbose_name='prename')), + ('lastname', models.CharField(max_length=20, verbose_name='last name')), + ('email', models.EmailField(default='', max_length=100)), ('birth_date', models.DateField(verbose_name='birth date')), - ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='members.Group')), + ('group', models.ManyToManyField(to='members.Group')), + ], + options={ + 'verbose_name_plural': 'members', + 'verbose_name': 'member', + }, + ), + migrations.CreateModel( + name='MemberList', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(default='', max_length=50, verbose_name='List Name')), + ('date', models.DateField(default=datetime.datetime.today)), + ('add_member', models.ManyToManyField(to='members.Member')), ], ), ] diff --git a/jdav_web/members/migrations/0002_member_email.py b/jdav_web/members/migrations/0002_member_email.py deleted file mode 100644 index a95ffbc..0000000 --- a/jdav_web/members/migrations/0002_member_email.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.2 on 2016-10-18 17:41 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('members', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='member', - name='email', - field=models.CharField(default='', max_length=100), - ), - ] diff --git a/jdav_web/members/migrations/0003_auto_20161018_1742.py b/jdav_web/members/migrations/0003_auto_20161018_1742.py deleted file mode 100644 index f95b120..0000000 --- a/jdav_web/members/migrations/0003_auto_20161018_1742.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.2 on 2016-10-18 17:42 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('members', '0002_member_email'), - ] - - operations = [ - migrations.AlterField( - model_name='member', - name='email', - field=models.EmailField(default='', max_length=100), - ), - ] diff --git a/jdav_web/members/migrations/0004_auto_20161018_1744.py b/jdav_web/members/migrations/0004_auto_20161018_1744.py deleted file mode 100644 index e479a16..0000000 --- a/jdav_web/members/migrations/0004_auto_20161018_1744.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.2 on 2016-10-18 17:44 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('members', '0003_auto_20161018_1742'), - ] - - operations = [ - migrations.RemoveField( - model_name='member', - name='group', - ), - migrations.AddField( - model_name='member', - name='group', - field=models.ManyToManyField(to='members.Group'), - ), - ] diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index d15f7e7..41987eb 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -116,8 +116,7 @@ class Klettertreff(models.Model): return self.location + ' ' + self.date.strftime('%d.%m.%Y') def get_jugendleiter(self): - jl_string = ''.join(j.name + ',\n' for j in self.jugendleiter.all()) - jl_string = jl_string[:-2] + jl_string = ', '.join(j.name for j in self.jugendleiter.all()) return jl_string get_jugendleiter.short_description = _('Jugendleiter') diff --git a/jdav_web/startpage/migrations/__init__.py b/jdav_web/startpage/migrations/__init__.py deleted file mode 100644 index e69de29..0000000