diff --git a/recoverdir/forms.py b/recoverdir/forms.py index e93c44e..0b27612 100644 --- a/recoverdir/forms.py +++ b/recoverdir/forms.py @@ -55,14 +55,14 @@ class HLForm(forms.ModelForm): class Meta: 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 = '__all__' + 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 = { 'rd_main' : "Zuständige RD", 'rd_name': "Vor- und Nachname RD Leiter", #'rd_prename': "Vorname RD Leiter", #'rd_postname' : "Nachname RD Leiter", - # WIEDER REIN 'rd_adresse' : "RD Adresse", + 'rd_adresse' : "RD Adresse", #'rd_plz' : "RD PLZ", #'rd_city' : "RD Stadt", 'rd_tel' : "RD Telefon", @@ -78,10 +78,10 @@ class HLFVForm(forms.ModelForm): class Meta: 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 = '__all__' + 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 = { 'vf_ver_company' : "Firma", 'vf_ver_name' : 'Name', @@ -102,7 +102,7 @@ class HLFVForm(forms.ModelForm): 'vf_rv_tel_1' : "Telefon 1", 'vf_rv_tel_2' : "Telefon 2" } - ''' + @@ -189,9 +189,9 @@ class RDContactF(forms.ModelForm): class Meta: model = RDContact - #fields = ['rd_name','rd_rel','rd_adresse','rd_tel', 'rd_mail'] - fields = '__all__' - ''' + fields = ['rd_name','rd_rel','rd_adresse','rd_tel', 'rd_mail'] + #fields = '__all__' + labels = { 'rd_name' : "Vor- und Nachname", 'rd_rel' : "Beziehung", @@ -199,7 +199,7 @@ class RDContactF(forms.ModelForm): 'rd_mail' : "E-Mailadresse", 'rd_tel' : "Telefon" } - ''' + # ERgo Digitaler Versicherungsordern class ErgoVerDirF(forms.ModelForm): @@ -256,9 +256,9 @@ class RDTrustPersonF(forms.ModelForm): class Meta: model = RDTrustPerson - fields = '__all__' - #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 = { 'rd_name' : "Vor- und Nachname", 'rd_company' : "Firma", @@ -266,7 +266,7 @@ class RDTrustPersonF(forms.ModelForm): 'rd_mail' : "E-Mailadresse", 'rd_tel' : "Telefon" } - ''' + # Banken usw. diff --git a/recoverdir/models.py b/recoverdir/models.py index f71d6a4..b57d1da 100644 --- a/recoverdir/models.py +++ b/recoverdir/models.py @@ -41,16 +41,16 @@ class Handlungsleitfaden(models.Model): rd_main = 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_adresse = 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_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) # ENDE # 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)) + #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)) @@ -66,12 +66,12 @@ class Handlungsleitfaden(models.Model): class RDContact(models.Model): agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) # REIN - 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_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)) # RAUS # 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)) # ENDE rd_rel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) @@ -89,7 +89,7 @@ class RDTrustPerson(models.Model): # ENDE # RAUS - 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)) # ENDE 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)) @@ -116,14 +116,14 @@ class HandlungsleitfadenVF(models.Model): vf_ver_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) # RAUS - 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)) + #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)) + 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)) @@ -133,7 +133,7 @@ class HandlungsleitfadenVF(models.Model): vf_fb_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) # REIN - #vf_fb_adresse = 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))