add more pythonic string generation in klettertreff model

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',
+            },
         ),
     ]

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)),
+                ('name', models.CharField(max_length=20, verbose_name='name')),
-                ('min_age', models.IntegerField(default=5)),
+                ('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)),
+                ('prename', models.CharField(max_length=20, verbose_name='prename')),
-                ('lastname', models.CharField(max_length=20)),
+                ('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')),
             ],
         ),
     ]

jdav_web/members/migrations/0002_member_email.py

@@ -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),
-        ),
-    ]

jdav_web/members/migrations/0003_auto_20161018_1742.py

@@ -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),
-        ),
-    ]

jdav_web/members/migrations/0004_auto_20161018_1744.py

@@ -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'),
-        ),
-    ]

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 = ', '.join(j.name for j in self.jugendleiter.all())
-        jl_string = jl_string[:-2]
         return jl_string
 
     get_jugendleiter.short_description = _('Jugendleiter')