Felder VOR önderungen

This commit is contained in:
holger.trampe 2020-10-25 16:59:20 +01:00
parent 5b5c63cca1
commit 273b01be8a
2 changed files with 62 additions and 27 deletions

View File

@ -55,14 +55,14 @@ class HLForm(forms.ModelForm):
class Meta: class Meta:
model = Handlungsleitfaden model = Handlungsleitfaden
fields = ['rd_main','rd_name','rd_adresse','rd_tel','rd_mail','bvk_number','rv_name','rv_number','rv_tel_1','rv_tel_2'] #fields = ['rd_main','rd_name','rd_adresse','rd_tel','rd_mail','bvk_number','rv_name','rv_number','rv_tel_1','rv_tel_2']
fields = '__all__'
labels = { labels = {
'rd_main' : "Zuständige RD", 'rd_main' : "Zuständige RD",
'rd_name': "Vor- und Nachname RD Leiter", 'rd_name': "Vor- und Nachname RD Leiter",
#'rd_prename': "Vorname RD Leiter", #'rd_prename': "Vorname RD Leiter",
#'rd_postname' : "Nachname RD Leiter", #'rd_postname' : "Nachname RD Leiter",
'rd_adresse' : "RD Adresse", # WIEDER REIN 'rd_adresse' : "RD Adresse",
#'rd_plz' : "RD PLZ", #'rd_plz' : "RD PLZ",
#'rd_city' : "RD Stadt", #'rd_city' : "RD Stadt",
'rd_tel' : "RD Telefon", 'rd_tel' : "RD Telefon",
@ -78,8 +78,10 @@ class HLFVForm(forms.ModelForm):
class Meta: class Meta:
model = HandlungsleitfadenVF model = HandlungsleitfadenVF
fields = ['vf_ver_company','vf_ver_name','vf_ver_adresse','vf_ver_tel','vf_ver_mail','vf_fb_company','vf_fb_name','vf_fb_adresse','vf_fb_tel','vf_fb_mail','vf_rv_name','vf_rv_number','vf_rv_tel_1','vf_rv_tel_2'] #fields = ['vf_ver_company','vf_ver_name','vf_ver_adresse','vf_ver_tel','vf_ver_mail','vf_fb_company','vf_fb_name','vf_fb_adresse','vf_fb_tel','vf_fb_mail','vf_rv_name','vf_rv_number','vf_rv_tel_1','vf_rv_tel_2']
fields = '__all__'
'''
labels = { labels = {
'vf_ver_company' : "Firma", 'vf_ver_company' : "Firma",
'vf_ver_name' : 'Name', 'vf_ver_name' : 'Name',
@ -100,6 +102,7 @@ class HLFVForm(forms.ModelForm):
'vf_rv_tel_1' : "Telefon 1", 'vf_rv_tel_1' : "Telefon 1",
'vf_rv_tel_2' : "Telefon 2" 'vf_rv_tel_2' : "Telefon 2"
} }
'''
@ -186,9 +189,9 @@ class RDContactF(forms.ModelForm):
class Meta: class Meta:
model = RDContact model = RDContact
fields = ['rd_name','rd_rel','rd_adresse','rd_tel', 'rd_mail'] #fields = ['rd_name','rd_rel','rd_adresse','rd_tel', 'rd_mail']
fields = '__all__'
'''
labels = { labels = {
'rd_name' : "Vor- und Nachname", 'rd_name' : "Vor- und Nachname",
'rd_rel' : "Beziehung", 'rd_rel' : "Beziehung",
@ -196,7 +199,7 @@ class RDContactF(forms.ModelForm):
'rd_mail' : "E-Mailadresse", 'rd_mail' : "E-Mailadresse",
'rd_tel' : "Telefon" 'rd_tel' : "Telefon"
} }
'''
# ERgo Digitaler Versicherungsordern # ERgo Digitaler Versicherungsordern
class ErgoVerDirF(forms.ModelForm): class ErgoVerDirF(forms.ModelForm):
@ -253,7 +256,9 @@ class RDTrustPersonF(forms.ModelForm):
class Meta: class Meta:
model = RDTrustPerson model = RDTrustPerson
fields = ['rd_name','rd_company','rd_adresse','rd_tel', 'rd_mail'] fields = '__all__'
#fields = ['rd_name','rd_company','rd_adresse','rd_tel', 'rd_mail']
'''
labels = { labels = {
'rd_name' : "Vor- und Nachname", 'rd_name' : "Vor- und Nachname",
'rd_company' : "Firma", 'rd_company' : "Firma",
@ -261,6 +266,7 @@ class RDTrustPersonF(forms.ModelForm):
'rd_mail' : "E-Mailadresse", 'rd_mail' : "E-Mailadresse",
'rd_tel' : "Telefon" 'rd_tel' : "Telefon"
} }
'''
# Banken usw. # Banken usw.

View File

@ -39,13 +39,20 @@ class PersLetter(models.Model):
class Handlungsleitfaden(models.Model): class Handlungsleitfaden(models.Model):
agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True)
rd_main = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_main = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
#rd_prename = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
#rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) # REIN
rd_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) #rd_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
#rd_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) #rd_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
rd_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) # ENDE
#rd_plz = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
#rd_city = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) # RAUS
rd_plz = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
rd_city = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
rd_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
rd_prename = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
# ENDE
rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
rd_mail = encrypt(models.EmailField(max_length=500, blank=True, default="", null=True)) rd_mail = encrypt(models.EmailField(max_length=500, blank=True, default="", null=True))
bvk_number = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) bvk_number = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
@ -58,9 +65,15 @@ class Handlungsleitfaden(models.Model):
# Contacts # Contacts
class RDContact(models.Model): class RDContact(models.Model):
agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True)
#rd_prename = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) # REIN
rd_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_prename = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
#rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
# RAUS
# REIN
#rd_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
# ENDE
rd_rel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_rel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
rd_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
@ -70,8 +83,14 @@ class RDContact(models.Model):
# Vertrauensperson # Vertrauensperson
class RDTrustPerson(models.Model): class RDTrustPerson(models.Model):
agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True)
# REIN
rd_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
#rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) # ENDE
# RAUS
rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
# ENDE
rd_company = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_company = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
rd_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
@ -95,18 +114,28 @@ class HandlungsleitfadenVF(models.Model):
agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True)
vf_ver_company = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) vf_ver_company = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
vf_ver_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) vf_ver_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
vf_ver_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
#vf_ver_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) # RAUS
#vf_ver_plzcity = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) vf_ver_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
vf_ver_plzcity = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
vf_fb_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
vf_fb_plzcity = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
# ENDE
# REIN
#vf_ver_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
# ENDE
vf_ver_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) vf_ver_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
vf_ver_mail = encrypt(models.EmailField(max_length=500, blank=True, default="", null=True)) vf_ver_mail = encrypt(models.EmailField(max_length=500, blank=True, default="", null=True))
vf_fb_company = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) vf_fb_company = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
vf_fb_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) vf_fb_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
vf_fb_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
#vf_fb_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) # REIN
#vf_fb_plzcity = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) #vf_fb_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
# ENDE
vf_fb_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) vf_fb_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
vf_fb_mail = encrypt(models.EmailField(max_length=500, blank=True, default="", null=True)) vf_fb_mail = encrypt(models.EmailField(max_length=500, blank=True, default="", null=True))