From 13f0259e8899fc4b8e02ab8fd1444a30d1791320 Mon Sep 17 00:00:00 2001 From: Benni Baermann Date: Mon, 2 Nov 2020 14:25:07 +0100 Subject: [PATCH] /extern modells finished --- input/migrations/0041_auto_20201102_1318.py | 43 +++++++++++++++++++++ input/migrations/0042_auto_20201102_1319.py | 43 +++++++++++++++++++++ input/migrations/0043_auto_20201102_1320.py | 18 +++++++++ input/models.py | 12 +++--- 4 files changed, 110 insertions(+), 6 deletions(-) create mode 100644 input/migrations/0041_auto_20201102_1318.py create mode 100644 input/migrations/0042_auto_20201102_1319.py create mode 100644 input/migrations/0043_auto_20201102_1320.py diff --git a/input/migrations/0041_auto_20201102_1318.py b/input/migrations/0041_auto_20201102_1318.py new file mode 100644 index 0000000..761c35f --- /dev/null +++ b/input/migrations/0041_auto_20201102_1318.py @@ -0,0 +1,43 @@ +# Generated by Django 3.1.1 on 2020-11-02 13:18 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('input', '0040_auto_20201102_1302'), + ] + + operations = [ + migrations.AlterField( + model_name='businesscard', + name='username', + field=models.CharField(max_length=200, null=True, verbose_name='Benutzer_innenname'), + ), + migrations.AlterField( + model_name='email', + name='username', + field=models.CharField(max_length=200, null=True, verbose_name='Benutzer_innenname'), + ), + migrations.AlterField( + model_name='ifg', + name='username', + field=models.CharField(max_length=200, null=True, verbose_name='Benutzer_innenname'), + ), + migrations.AlterField( + model_name='library', + name='username', + field=models.CharField(max_length=200, null=True, verbose_name='Benutzer_innenname'), + ), + migrations.AlterField( + model_name='list', + name='username', + field=models.CharField(max_length=200, null=True, verbose_name='Benutzer_innenname'), + ), + migrations.AlterField( + model_name='literature', + name='username', + field=models.CharField(max_length=200, null=True, verbose_name='Benutzer_innenname'), + ), + ] diff --git a/input/migrations/0042_auto_20201102_1319.py b/input/migrations/0042_auto_20201102_1319.py new file mode 100644 index 0000000..b2a815b --- /dev/null +++ b/input/migrations/0042_auto_20201102_1319.py @@ -0,0 +1,43 @@ +# Generated by Django 3.1.1 on 2020-11-02 13:19 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('input', '0041_auto_20201102_1318'), + ] + + operations = [ + migrations.AlterField( + model_name='ifg', + name='cost', + field=models.CharField(max_length=10, verbose_name='Kosten'), + ), + migrations.AlterField( + model_name='ifg', + name='notes', + field=models.CharField(blank=True, max_length=500, verbose_name='Anmerkungen'), + ), + migrations.AlterField( + model_name='library', + name='cost', + field=models.CharField(max_length=10, verbose_name='Kosten'), + ), + migrations.AlterField( + model_name='library', + name='notes', + field=models.CharField(blank=True, max_length=500, verbose_name='Anmerkungen'), + ), + migrations.AlterField( + model_name='literature', + name='cost', + field=models.CharField(max_length=10, verbose_name='Kosten'), + ), + migrations.AlterField( + model_name='literature', + name='notes', + field=models.CharField(blank=True, max_length=500, verbose_name='Anmerkungen'), + ), + ] diff --git a/input/migrations/0043_auto_20201102_1320.py b/input/migrations/0043_auto_20201102_1320.py new file mode 100644 index 0000000..2b27db0 --- /dev/null +++ b/input/migrations/0043_auto_20201102_1320.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.1 on 2020-11-02 13:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('input', '0042_auto_20201102_1319'), + ] + + operations = [ + migrations.AlterField( + model_name='library', + name='duration', + field=models.CharField(max_length=100, verbose_name='Dauer'), + ), + ] diff --git a/input/models.py b/input/models.py index ef52720..4665c0d 100644 --- a/input/models.py +++ b/input/models.py @@ -27,7 +27,7 @@ class Volunteer(models.Model): class Extern(Volunteer): ''' abstract basis class for all data entered by extern volunteers ''' - username = models.CharField(max_length=200, null=True) + username = models.CharField(max_length=200, null=True, verbose_name='Benutzer_innenname') # the following Fields are not supposed to be edited by users service_id = models.CharField(max_length=15, null=True, blank=True) @@ -117,8 +117,8 @@ class Travel(Intern): #abstract base class for Library and IFG class Grant(Extern): - cost = models.CharField(max_length=10) - notes = models.CharField(max_length=500, blank=True) + cost = models.CharField(max_length=10, verbose_name='Kosten') + notes = models.CharField(max_length=500, blank=True, verbose_name='Anmerkungen') class Meta: abstract = True @@ -143,14 +143,14 @@ class Library(Grant): default='LIB', ) library = models.CharField(max_length=200) - duration = models.CharField(max_length=100) + duration = models.CharField(max_length=100, verbose_name="Dauer") def __str__(self): return self.library class Literature(Grant): - info = models.CharField(max_length=500) - source = models.CharField(max_length=200) + info = models.CharField(max_length=500, verbose_name='Informationen zum Werk') + source = models.CharField(max_length=200, verbose_name='Bezugsquelle') class IFG(Grant): url = models.CharField(max_length=2000)