forked from beba/foerderbarometer
auto formatting: removed whitespace
This commit is contained in:
parent
4aeb330fa4
commit
e0538bbc9a
|
|
@ -40,7 +40,7 @@ class Volunteer(models.Model):
|
||||||
|
|
||||||
class Extern(Volunteer):
|
class Extern(Volunteer):
|
||||||
''' abstract basis class for all data entered by extern volunteers '''
|
''' abstract basis class for all data entered by extern volunteers '''
|
||||||
|
|
||||||
username = models.CharField(max_length=200, null=True, verbose_name='Benutzer_innenname',
|
username = models.CharField(max_length=200, null=True, verbose_name='Benutzer_innenname',
|
||||||
help_text=format_html("Wikimedia Benutzer_innenname"))
|
help_text=format_html("Wikimedia Benutzer_innenname"))
|
||||||
|
|
||||||
|
|
@ -91,7 +91,7 @@ class Project(Volunteer):
|
||||||
granted_from = models.CharField(max_length=100,null=True,verbose_name='Bewilligt von')
|
granted_from = models.CharField(max_length=100,null=True,verbose_name='Bewilligt von')
|
||||||
notes = models.TextField(max_length=1000,null=True,blank=True,verbose_name='Anmerkungen')
|
notes = models.TextField(max_length=1000,null=True,blank=True,verbose_name='Anmerkungen')
|
||||||
intern_notes = models.TextField(max_length=1000, blank=True, verbose_name="interne Anmerkungen")
|
intern_notes = models.TextField(max_length=1000, blank=True, verbose_name="interne Anmerkungen")
|
||||||
|
|
||||||
|
|
||||||
# the following Fields are not supposed to be edited by users
|
# the following Fields are not supposed to be edited by users
|
||||||
pid = models.CharField(max_length=15, null=True, blank=True)
|
pid = models.CharField(max_length=15, null=True, blank=True)
|
||||||
|
|
@ -102,7 +102,7 @@ class Project(Volunteer):
|
||||||
|
|
||||||
|
|
||||||
def save(self,*args,**kwargs):
|
def save(self,*args,**kwargs):
|
||||||
|
|
||||||
generate_finance_id=False
|
generate_finance_id=False
|
||||||
|
|
||||||
'''we generate the autogenerated fields here'''
|
'''we generate the autogenerated fields here'''
|
||||||
|
|
@ -123,7 +123,7 @@ class Project(Volunteer):
|
||||||
else:
|
else:
|
||||||
self.finance_id = str(self.account.code)
|
self.finance_id = str(self.account.code)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -141,7 +141,7 @@ class Project(Volunteer):
|
||||||
self.project_of_year = int(projects.project_of_year) + 1
|
self.project_of_year = int(projects.project_of_year) + 1
|
||||||
# self.pid = str(self.start.year) + '-' + str(self.account.code) + str(self.project_of_year).zfill(3)
|
# self.pid = str(self.start.year) + '-' + str(self.account.code) + str(self.project_of_year).zfill(3)
|
||||||
|
|
||||||
|
|
||||||
if str(self.account.code) == '21111':
|
if str(self.account.code) == '21111':
|
||||||
self.finance_id = str(self.account.code) + '-' + str(self.project_of_year).zfill(3)
|
self.finance_id = str(self.account.code) + '-' + str(self.project_of_year).zfill(3)
|
||||||
else:
|
else:
|
||||||
|
|
@ -229,7 +229,7 @@ from django.dispatch import receiver
|
||||||
@receiver(pre_save, sender=Travel, dispatch_uid="get_project_end")
|
@receiver(pre_save, sender=Travel, dispatch_uid="get_project_end")
|
||||||
def getProjectEnd(sender, instance, **kwargs):
|
def getProjectEnd(sender, instance, **kwargs):
|
||||||
#instance.project_end = instance.project.end
|
#instance.project_end = instance.project.end
|
||||||
|
|
||||||
if instance.project:
|
if instance.project:
|
||||||
instance.project_end = instance.project.end
|
instance.project_end = instance.project.end
|
||||||
instance.project_end_quartal = instance.project.end_quartal
|
instance.project_end_quartal = instance.project.end_quartal
|
||||||
|
|
@ -303,7 +303,7 @@ class IFG(Grant):
|
||||||
url = models.URLField(max_length=2000, verbose_name="URL",
|
url = models.URLField(max_length=2000, verbose_name="URL",
|
||||||
help_text="Bitte gib den Link zu deiner Anfrage bei Frag den Staat an.")
|
help_text="Bitte gib den Link zu deiner Anfrage bei Frag den Staat an.")
|
||||||
intern_notes = models.TextField(max_length=1000, blank=True, verbose_name="interne Anmerkungen")
|
intern_notes = models.TextField(max_length=1000, blank=True, verbose_name="interne Anmerkungen")
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "IFG-Anfrage von " + self.realname
|
return "IFG-Anfrage von " + self.realname
|
||||||
|
|
||||||
|
|
@ -375,7 +375,7 @@ class BusinessCard(Extern):
|
||||||
default='NOPIC', verbose_name='Variante',
|
default='NOPIC', verbose_name='Variante',
|
||||||
help_text=format_html('so sehen die Varianten aus: <a href="https://upload.wikimedia.org/wikipedia/commons/c/cd/Muster_Visitenkarten_WMDE_2018.jpg">\
|
help_text=format_html('so sehen die Varianten aus: <a href="https://upload.wikimedia.org/wikipedia/commons/c/cd/Muster_Visitenkarten_WMDE_2018.jpg">\
|
||||||
mit Bild</a> <a href="https://upload.wikimedia.org/wikipedia/commons/d/d3/Muster_Visitenkarte_WMDE.png">ohne Bild</a>' ))
|
mit Bild</a> <a href="https://upload.wikimedia.org/wikipedia/commons/d/d3/Muster_Visitenkarte_WMDE.png">ohne Bild</a>' ))
|
||||||
|
|
||||||
url_of_pic = models.CharField(max_length=200, verbose_name='Url des Bildes', default='', help_text="Bitte gib die Wikimedia-Commons-URL des Bildes an.")
|
url_of_pic = models.CharField(max_length=200, verbose_name='Url des Bildes', default='', help_text="Bitte gib die Wikimedia-Commons-URL des Bildes an.")
|
||||||
|
|
||||||
sent_to = models.TextField(max_length=1000, verbose_name='Versandadresse',
|
sent_to = models.TextField(max_length=1000, verbose_name='Versandadresse',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue